| Index: blimp/engine/feature/geolocation/blimp_location_provider.h
|
| diff --git a/blimp/engine/feature/geolocation/blimp_location_provider.h b/blimp/engine/feature/geolocation/blimp_location_provider.h
|
| index d5ffe5ac23ee459b4b1a8a39371a6ed49716b306..d59a70b853987c35da124a820b4ab9a40c24211b 100644
|
| --- a/blimp/engine/feature/geolocation/blimp_location_provider.h
|
| +++ b/blimp/engine/feature/geolocation/blimp_location_provider.h
|
| @@ -7,20 +7,20 @@
|
|
|
| #include "base/memory/weak_ptr.h"
|
| #include "blimp/common/proto/geolocation.pb.h"
|
| -#include "device/geolocation/geoposition.h"
|
| -#include "device/geolocation/location_provider.h"
|
| +#include "content/public/browser/location_provider.h"
|
| +#include "content/public/common/geoposition.h"
|
|
|
| namespace blimp {
|
| namespace engine {
|
|
|
| // Location provider for Blimp using the device's provider over the network.
|
| -class BlimpLocationProvider : public device::LocationProvider {
|
| +class BlimpLocationProvider : public content::LocationProvider {
|
| public:
|
| // A delegate that implements a subset of LocationProvider's functions.
|
| class Delegate {
|
| public:
|
| using GeopositionReceivedCallback =
|
| - base::Callback<void(const device::Geoposition&)>;
|
| + base::Callback<void(const content::Geoposition&)>;
|
|
|
| virtual ~Delegate() {}
|
|
|
| @@ -34,10 +34,10 @@ class BlimpLocationProvider : public device::LocationProvider {
|
| explicit BlimpLocationProvider(base::WeakPtr<Delegate> delegate);
|
| ~BlimpLocationProvider() override;
|
|
|
| - // device::LocationProvider implementation.
|
| + // content::LocationProvider implementation.
|
| bool StartProvider(bool high_accuracy) override;
|
| void StopProvider() override;
|
| - void GetPosition(device::Geoposition* position) override;
|
| + void GetPosition(content::Geoposition* position) override;
|
| void RequestRefresh() override;
|
| void OnPermissionGranted() override;
|
| void SetUpdateCallback(
|
| @@ -47,7 +47,7 @@ class BlimpLocationProvider : public device::LocationProvider {
|
| // This delegate handles a subset of the LocationProvider functionality.
|
| base::WeakPtr<Delegate> delegate_;
|
|
|
| - device::Geoposition cached_position_;
|
| + content::Geoposition cached_position_;
|
|
|
| // True if a successful StartProvider call has occured.
|
| bool is_started_;
|
|
|