Index: content/browser/geolocation/location_arbitrator_impl.h |
diff --git a/device/geolocation/location_arbitrator_impl.h b/content/browser/geolocation/location_arbitrator_impl.h |
similarity index 87% |
rename from device/geolocation/location_arbitrator_impl.h |
rename to content/browser/geolocation/location_arbitrator_impl.h |
index f21fb9990a15d167a39b4531db4436efe4c645dd..15902b6528ff1f54f5bdd488f7b62845ffaa894e 100644 |
--- a/device/geolocation/location_arbitrator_impl.h |
+++ b/content/browser/geolocation/location_arbitrator_impl.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef DEVICE_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_ |
-#define DEVICE_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_ |
+#ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_ |
+#define CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_ |
#include <stdint.h> |
#include <vector> |
@@ -14,19 +14,19 @@ |
#include "base/memory/scoped_vector.h" |
#include "base/strings/string16.h" |
#include "base/time/time.h" |
-#include "device/geolocation/access_token_store.h" |
-#include "device/geolocation/geolocation_export.h" |
-#include "device/geolocation/geolocation_provider.h" |
-#include "device/geolocation/geoposition.h" |
-#include "device/geolocation/location_arbitrator.h" |
-#include "device/geolocation/location_provider.h" |
+#include "content/browser/geolocation/location_arbitrator.h" |
+#include "content/common/content_export.h" |
+#include "content/public/browser/access_token_store.h" |
+#include "content/public/browser/geolocation_provider.h" |
+#include "content/public/browser/location_provider.h" |
+#include "content/public/common/geoposition.h" |
#include "net/url_request/url_request_context_getter.h" |
namespace net { |
class URLRequestContextGetter; |
} |
-namespace device { |
+namespace content { |
class AccessTokenStore; |
class GeolocationDelegate; |
class LocationProvider; |
@@ -34,8 +34,7 @@ class LocationProvider; |
// This class is responsible for handling updates from multiple underlying |
// providers and resolving them to a single 'best' location fix at any given |
// moment. |
-class DEVICE_GEOLOCATION_EXPORT LocationArbitratorImpl |
- : public LocationArbitrator { |
+class CONTENT_EXPORT LocationArbitratorImpl : public LocationArbitrator { |
public: |
// Number of milliseconds newer a location provider has to be that it's worth |
// switching to this location provider on the basis of it being fresher |
@@ -124,6 +123,6 @@ class DEVICE_GEOLOCATION_EXPORT LocationArbitratorImpl |
// over the platform-dependent implementations. |
std::unique_ptr<LocationProvider> NewSystemLocationProvider(); |
-} // namespace device |
+} // namespace content |
-#endif // DEVICE_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_ |
+#endif // CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_ |