| Index: content/renderer/geolocation_dispatcher.h
|
| diff --git a/content/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h
|
| index 705ff9f330c23d8cb9036d019027926346b59179..545ef3476869628633cc5fe81ff4bdc91bff8a2b 100644
|
| --- a/content/renderer/geolocation_dispatcher.h
|
| +++ b/content/renderer/geolocation_dispatcher.h
|
| @@ -6,8 +6,8 @@
|
| #define CONTENT_RENDERER_GEOLOCATION_DISPATCHER_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "content/common/geolocation_service.mojom.h"
|
| -#include "content/common/permission_service.mojom.h"
|
| +#include "components/geolocation/public/interfaces/geolocation.mojom.h"
|
| +#include "components/permission/public/interfaces/permission.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"
|
| @@ -45,18 +45,18 @@ class GeolocationDispatcher
|
| const blink::WebGeolocationPermissionRequest& permissionRequest) override;
|
|
|
| void QueryNextPosition();
|
| - void OnPositionUpdate(MojoGeopositionPtr geoposition);
|
| + void OnPositionUpdate(geolocation::GeopositionPtr geoposition);
|
|
|
| // Permission for using geolocation has been set.
|
| - void OnPermissionSet(int permission_request_id, PermissionStatus status);
|
| + void OnPermissionSet(int permission_request_id, permission::Status status);
|
|
|
| scoped_ptr<blink::WebGeolocationController> controller_;
|
|
|
| scoped_ptr<blink::WebGeolocationPermissionRequestManager>
|
| pending_permissions_;
|
| - GeolocationServicePtr geolocation_service_;
|
| + geolocation::GeolocationServicePtr geolocation_service_;
|
| bool enable_high_accuracy_;
|
| - PermissionServicePtr permission_service_;
|
| + permission::PermissionServicePtr permission_service_;
|
| };
|
|
|
| } // namespace content
|
|
|