| Index: device/geolocation/geolocation_service_impl.h
|
| diff --git a/device/geolocation/geolocation_service_impl.h b/device/geolocation/geolocation_service_impl.h
|
| index 7cd3c6560ec68d4892bb1037ba90579cc16b8590..305920e9e7397dd4d3c91e174f8cd854ee35787a 100644
|
| --- a/device/geolocation/geolocation_service_impl.h
|
| +++ b/device/geolocation/geolocation_service_impl.h
|
| @@ -6,8 +6,8 @@
|
|
|
| #include "base/macros.h"
|
| #include "device/geolocation/geolocation_provider_impl.h"
|
| +#include "device/geolocation/public/interfaces/geolocation.mojom.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| -#include "third_party/WebKit/public/platform/modules/geolocation/geolocation.mojom.h"
|
|
|
| #ifndef DEVICE_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_
|
| #define DEVICE_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_
|
| @@ -18,13 +18,13 @@ class GeolocationProvider;
|
| class GeolocationServiceContext;
|
|
|
| // Implements the GeolocationService Mojo interface.
|
| -class GeolocationServiceImpl : public blink::mojom::GeolocationService {
|
| +class GeolocationServiceImpl : public mojom::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
|
| // is being used.
|
| GeolocationServiceImpl(
|
| - mojo::InterfaceRequest<blink::mojom::GeolocationService> request,
|
| + mojo::InterfaceRequest<mojom::GeolocationService> request,
|
| GeolocationServiceContext* context,
|
| const base::Closure& update_callback);
|
| ~GeolocationServiceImpl() override;
|
| @@ -41,7 +41,7 @@ class GeolocationServiceImpl : public blink::mojom::GeolocationService {
|
| void ClearOverride();
|
|
|
| private:
|
| - // blink::mojom::GeolocationService:
|
| + // mojom::GeolocationService:
|
| void SetHighAccuracy(bool high_accuracy) override;
|
| void QueryNextPosition(const QueryNextPositionCallback& callback) override;
|
|
|
| @@ -51,7 +51,7 @@ class GeolocationServiceImpl : public blink::mojom::GeolocationService {
|
| void ReportCurrentPosition();
|
|
|
| // The binding between this object and the other end of the pipe.
|
| - mojo::Binding<blink::mojom::GeolocationService> binding_;
|
| + mojo::Binding<mojom::GeolocationService> binding_;
|
|
|
| // Owns this object.
|
| GeolocationServiceContext* context_;
|
| @@ -68,7 +68,7 @@ class GeolocationServiceImpl : public blink::mojom::GeolocationService {
|
| // subsequently been called.
|
| Geoposition position_override_;
|
|
|
| - blink::mojom::Geoposition current_position_;
|
| + mojom::Geoposition current_position_;
|
|
|
| // Whether this instance is currently observing location updates with high
|
| // accuracy.
|
|
|