GeoLocation adaptations for Chromium 55

Restructures geolocation classes to fit new code

Change-Id: Ic370bd4cef4ba3f7c98931761d180fccd0b82cb7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

1 files changed, 12 insertions, 11 deletions

diff --git a/src/core/location_provider_qt.h b/src/core/location_provider_qt.h
index b35dcddf9..b1ff354a0 100644
--- a/src/core/location_provider_qt.h
+++ b/src/core/location_provider_qt.h
@@ -42,8 +42,8 @@
 
 #include <QtCore/qcompilerdetection.h>
 
-#include "content/browser/geolocation/location_provider_base.h"
-#include "content/public/common/geoposition.h"
+#include "device/geolocation/geoposition.h"
+#include "device/geolocation/location_provider.h"
 
 QT_FORWARD_DECLARE_CLASS(QThread)
 
@@ -54,25 +54,26 @@ class MessageLoop;
 namespace QtWebEngineCore {
 class QtPositioningHelper;
 
-class LocationProviderQt : public content::LocationProviderBase
+class LocationProviderQt : public device::LocationProvider
 {
 public:
     LocationProviderQt();
     virtual ~LocationProviderQt();
 
-    // LocationProviderBase
-    virtual bool StartProvider(bool highAccuracy) Q_DECL_OVERRIDE;
-    virtual void StopProvider() Q_DECL_OVERRIDE;
-    virtual void GetPosition(content::Geoposition *position) Q_DECL_OVERRIDE { *position = m_lastKnownPosition; }
-    virtual void RequestRefresh() Q_DECL_OVERRIDE;
-    virtual void OnPermissionGranted() Q_DECL_OVERRIDE;
+    // LocationProvider
+    bool StartProvider(bool high_accuracy) override;
+    void StopProvider() override;
+    const device::Geoposition& GetPosition() override { return m_lastKnownPosition; }
+    void OnPermissionGranted() override;
+    void SetUpdateCallback(const LocationProviderUpdateCallback& callback) override;
 
 private:
     friend class QtPositioningHelper;
 
-    void updatePosition(const content::Geoposition &);
+    void updatePosition(const device::Geoposition &);
 
-    content::Geoposition m_lastKnownPosition;
+    device::Geoposition m_lastKnownPosition;
+    LocationProviderUpdateCallback m_callback;
     QtPositioningHelper *m_positioningHelper;
 };
 //#define QT_USE_POSITIONING 1