webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 3 insertions, 9 deletions

diff --git a/Source/WebCore/Modules/proximity/DeviceProximityController.h b/Source/WebCore/Modules/proximity/DeviceProximityController.h
index 9fd6ffb6d..5b30dfe47 100644
--- a/Source/WebCore/Modules/proximity/DeviceProximityController.h
+++ b/Source/WebCore/Modules/proximity/DeviceProximityController.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DeviceProximityController_h
-#define DeviceProximityController_h
+#pragma once
 
 #if ENABLE(PROXIMITY_EVENTS)
 
@@ -36,25 +35,20 @@ class DeviceProximityClient;
 
 class DeviceProximityController : public DeviceController {
 public:
+    explicit DeviceProximityController(DeviceProximityClient*);
     ~DeviceProximityController() { }
 
-    static PassOwnPtr<DeviceProximityController> create(DeviceProximityClient*);
-
     void didChangeDeviceProximity(const double value, const double min, const double max);
     DeviceProximityClient* deviceProximityClient();
 
     virtual bool hasLastData();
-    virtual PassRefPtr<Event> getLastEvent();
+    virtual RefPtr<Event> getLastEvent();
 
     static const char* supplementName();
     static DeviceProximityController* from(Page*);
     static bool isActiveAt(Page*);
-
-private:
-    explicit DeviceProximityController(DeviceProximityClient*);
 };
 
 } // namespace WebCore
 
 #endif // PROXIMITY_EVENTS
-#endif // DeviceProximityController_h