Index: content/browser/geolocation/geolocation_service_impl.h |
diff --git a/content/browser/geolocation/geolocation_service_impl.h b/content/browser/geolocation/geolocation_service_impl.h |
index 45b37e7fd601c21e3b20c4682b559c7d8d5c284c..79019656d218fbbdb6471765977267a1038dd300 100644 |
--- a/content/browser/geolocation/geolocation_service_impl.h |
+++ b/content/browser/geolocation/geolocation_service_impl.h |
@@ -3,9 +3,8 @@ |
// found in the LICENSE file. |
#include "base/memory/scoped_ptr.h" |
+#include "components/geolocation/public/interfaces/geolocation.mojom.h" |
#include "content/browser/geolocation/geolocation_provider_impl.h" |
-#include "content/common/geolocation_service.mojom.h" |
-#include "content/public/common/mojo_geoposition.mojom.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" |
#ifndef CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_ |
@@ -17,7 +16,7 @@ class GeolocationProvider; |
class GeolocationServiceContext; |
// Implements the GeolocationService Mojo interface. |
-class GeolocationServiceImpl : public GeolocationService { |
+class GeolocationServiceImpl : public geolocation::GeolocationService { |
public: |
// |context| must outlive this object. |update_callback| will be called when |
// location updates are sent, allowing the client to know when the service |
@@ -39,7 +38,7 @@ class GeolocationServiceImpl : public GeolocationService { |
void ClearOverride(); |
private: |
- typedef mojo::Callback<void(MojoGeopositionPtr)> PositionCallback; |
+ typedef mojo::Callback<void(geolocation::GeopositionPtr)> PositionCallback; |
// GeolocationService: |
void SetHighAccuracy(bool high_accuracy) override; |
@@ -68,7 +67,7 @@ class GeolocationServiceImpl : public GeolocationService { |
// subsequently been called. |
Geoposition position_override_; |
- MojoGeoposition current_position_; |
+ geolocation::Geoposition current_position_; |
// Whether this instance is currently observing location updates with high |
// accuracy. |