Index: device/geolocation/network_location_provider.h |
diff --git a/content/browser/geolocation/network_location_provider.h b/device/geolocation/network_location_provider.h |
similarity index 87% |
rename from content/browser/geolocation/network_location_provider.h |
rename to device/geolocation/network_location_provider.h |
index cef1ad161407d5d252fb886d7a4d65e8aeab8954..d5ddcbfe75e7a5960b9e97db557898ad84e55c3d 100644 |
--- a/content/browser/geolocation/network_location_provider.h |
+++ b/device/geolocation/network_location_provider.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 CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_ |
-#define CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_ |
+#ifndef DEVICE_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_ |
+#define DEVICE_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_ |
#include <stddef.h> |
@@ -17,20 +17,20 @@ |
#include "base/strings/string16.h" |
#include "base/threading/non_thread_safe.h" |
#include "base/threading/thread.h" |
-#include "content/browser/geolocation/location_provider_base.h" |
-#include "content/browser/geolocation/network_location_request.h" |
-#include "content/browser/geolocation/wifi_data_provider_manager.h" |
-#include "content/common/content_export.h" |
-#include "content/public/common/geoposition.h" |
+#include "device/geolocation/geolocation_export.h" |
+#include "device/geolocation/geoposition.h" |
+#include "device/geolocation/location_provider_base.h" |
+#include "device/geolocation/network_location_request.h" |
+#include "device/geolocation/wifi_data_provider_manager.h" |
-namespace content { |
+namespace device { |
class AccessTokenStore; |
class NetworkLocationProvider : public base::NonThreadSafe, |
public LocationProviderBase { |
public: |
// Cache of recently resolved locations. Public for tests. |
- class CONTENT_EXPORT PositionCache { |
+ class DEVICE_GEOLOCATION_EXPORT PositionCache { |
public: |
// The maximum size of the cache of positions. |
static const size_t kMaximumSize; |
@@ -135,12 +135,12 @@ class NetworkLocationProvider : public base::NonThreadSafe, |
// Factory functions for the various types of location provider to abstract |
// over the platform-dependent implementations. |
-CONTENT_EXPORT LocationProviderBase* NewNetworkLocationProvider( |
+DEVICE_GEOLOCATION_EXPORT LocationProviderBase* NewNetworkLocationProvider( |
const scoped_refptr<AccessTokenStore>& access_token_store, |
const scoped_refptr<net::URLRequestContextGetter>& context, |
const GURL& url, |
const base::string16& access_token); |
-} // namespace content |
+} // namespace device |
-#endif // CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_ |
+#endif // DEVICE_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_ |