Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1244)

Unified Diff: content/browser/geolocation/geolocation_service_impl.h

Issue 1771743002: Move geolocation and permission mojoms into WebKit/public/platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3eb704f31fdabbf04b6b8e736a529bde6c31f5ec..e0565eed8d55c72cb251b954f9fddbafa2c418b4 100644
--- a/content/browser/geolocation/geolocation_service_impl.h
+++ b/content/browser/geolocation/geolocation_service_impl.h
@@ -5,9 +5,8 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.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 "mojo/public/cpp/bindings/binding.h"
+#include "third_party/WebKit/public/platform/modules/geolocation/geolocation.mojom.h"
#ifndef CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_
#define CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_
@@ -18,13 +17,13 @@ class GeolocationProvider;
class GeolocationServiceContext;
// Implements the GeolocationService Mojo interface.
-class GeolocationServiceImpl : public mojom::GeolocationService {
+class GeolocationServiceImpl : public blink::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<mojom::GeolocationService> request,
+ mojo::InterfaceRequest<blink::mojom::GeolocationService> request,
GeolocationServiceContext* context,
const base::Closure& update_callback);
~GeolocationServiceImpl() override;
@@ -41,9 +40,9 @@ class GeolocationServiceImpl : public mojom::GeolocationService {
void ClearOverride();
private:
- typedef mojo::Callback<void(mojom::MojoGeopositionPtr)> PositionCallback;
+ typedef mojo::Callback<void(blink::mojom::GeopositionPtr)> PositionCallback;
- // GeolocationService:
+ // blink::mojom::GeolocationService:
void SetHighAccuracy(bool high_accuracy) override;
void QueryNextPosition(const PositionCallback& callback) override;
@@ -53,7 +52,7 @@ class GeolocationServiceImpl : public mojom::GeolocationService {
void ReportCurrentPosition();
// The binding between this object and the other end of the pipe.
- mojo::Binding<mojom::GeolocationService> binding_;
+ mojo::Binding<blink::mojom::GeolocationService> binding_;
// Owns this object.
GeolocationServiceContext* context_;
@@ -70,7 +69,7 @@ class GeolocationServiceImpl : public mojom::GeolocationService {
// subsequently been called.
Geoposition position_override_;
- mojom::MojoGeoposition current_position_;
+ blink::mojom::Geoposition current_position_;
// Whether this instance is currently observing location updates with high
// accuracy.
« no previous file with comments | « content/browser/geolocation/geolocation_service_context.cc ('k') | content/browser/geolocation/geolocation_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698