Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / renderer / geolocation_dispatcher.h

diff --git a/src/content/renderer/geolocation_dispatcher.h b/src/content/renderer/geolocation_dispatcher.h
index f4f9163..454859d 100644 (file)
--- a/src/content/renderer/geolocation_dispatcher.h
+++ b/src/content/renderer/geolocation_dispatcher.h
@@ -6,6 +6,7 @@
 #define CONTENT_RENDERER_GEOLOCATION_DISPATCHER_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "content/common/geolocation_service.mojom.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "third_party/WebKit/public/web/WebGeolocationClient.h"
 #include "third_party/WebKit/public/web/WebGeolocationController.h"
@@ -23,15 +24,17 @@ struct Geoposition;
 // GeolocationDispatcher is a delegate for Geolocation messages used by
 // WebKit.
 // It's the complement of GeolocationDispatcherHost.
-class GeolocationDispatcher : public RenderFrameObserver,
-                              public blink::WebGeolocationClient {
+class GeolocationDispatcher
+    : public RenderFrameObserver,
+      public blink::WebGeolocationClient,
+      public mojo::InterfaceImpl<GeolocationServiceClient> {
  public:
   explicit GeolocationDispatcher(RenderFrame* render_frame);
   virtual ~GeolocationDispatcher();
 
  private:
   // RenderFrame::Observer implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
   // WebGeolocationClient
   virtual void startUpdating();
@@ -44,18 +47,18 @@ class GeolocationDispatcher : public RenderFrameObserver,
   virtual void cancelPermissionRequest(
       const blink::WebGeolocationPermissionRequest& permissionRequest);
 
+  // GeolocationServiceClient
+  void OnLocationUpdate(MojoGeopositionPtr geoposition) override;
+
   // Permission for using geolocation has been set.
   void OnPermissionSet(int bridge_id, bool is_allowed);
 
-  // We have an updated geolocation position or error code.
-  void OnPositionUpdated(const content::Geoposition& geoposition);
-
   scoped_ptr<blink::WebGeolocationController> controller_;
 
   scoped_ptr<blink::WebGeolocationPermissionRequestManager>
       pending_permissions_;
+  GeolocationServicePtr geolocation_service_;
   bool enable_high_accuracy_;
-  bool updating_;
 };
 
 }  // namespace content