Geolocation: move mojom from WebKit to device/geolocation/public/interfaces

third_party/WebKit/Source/modules/geolocation/Geolocation.h

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved.
  * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef Geolocation_h
 #define Geolocation_h
 
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/page/PageVisibilityObserver.h"
+#include "device/geolocation/public/interfaces/geolocation.mojom-blink.h"
 #include "modules/ModulesExport.h"
 #include "modules/geolocation/GeoNotifier.h"
 #include "modules/geolocation/GeolocationWatchers.h"
 #include "modules/geolocation/Geoposition.h"
 #include "modules/geolocation/PositionCallback.h"
 #include "modules/geolocation/PositionError.h"
 #include "modules/geolocation/PositionErrorCallback.h"
 #include "modules/geolocation/PositionOptions.h"
 #include "platform/Timer.h"
 #include "platform/heap/Handle.h"
-#include "third_party/WebKit/public/platform/modules/geolocation/geolocation.mojom-blink.h"
+
 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojom-blink.h"
 #include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom-blink.h"
 
 namespace blink {
 
 class Document;
 class LocalFrame;
 class GeolocationError;
 class ExecutionContext;
 
@@ skipping 103 matching lines @@
     // obtained.
     void startRequest(GeoNotifier*);
 
     bool haveSuitableCachedPosition(const PositionOptions&);
 
     // Record whether the origin trying to access Geolocation would be allowed
     // to access a feature that can only be accessed by secure origins.
     // See https://goo.gl/Y0ZkNV
     void recordOriginTypeAccess() const;
 
-    void onPositionUpdated(mojom::blink::GeopositionPtr);
+    void onPositionUpdated(device::mojom::blink::GeopositionPtr);
 
     // Processes the notifiers that were waiting for a permission decision. If
     // granted then the notifier's timers are started. Otherwise, a fatal error
     // is set on them.
     void onGeolocationPermissionUpdated(mojom::blink::PermissionStatus);
 
     void onGeolocationConnectionError();
     void onPermissionConnectionError();
 
     GeoNotifierSet m_oneShots;
     GeolocationWatchers m_watchers;
     GeoNotifierSet m_pendingForPermissionNotifiers;
     Member<Geoposition> m_lastPosition;
 
     // States of Geolocation permission as granted by the embedder. Unknown
     // means that the embedder still has to be asked for the current permission
     // level; Requested means that the user has yet to make a decision.
     enum Permission {
         PermissionUnknown,
         PermissionRequested,
         PermissionAllowed,
         PermissionDenied
     };
 
     Permission m_geolocationPermission;
-    mojom::blink::GeolocationServicePtr m_geolocationService;
+    device::mojom::blink::GeolocationServicePtr m_geolocationService;
     bool m_enableHighAccuracy = false;
     mojom::blink::PermissionServicePtr m_permissionService;
 
     // Whether a GeoNotifier is waiting for a position update.
     bool m_updating = false;
 
     // Set to true when m_geolocationService is disconnected. This is used to
     // detect when m_geolocationService is disconnected and reconnected while
     // running callbacks in response to a call to onPositionUpdated().
     bool m_disconnectedGeolocationService = false;
 };
 
 } // namespace blink
 
 #endif // Geolocation_h