Index: content/browser/geolocation/geolocation_provider_impl.h |
diff --git a/device/geolocation/geolocation_provider_impl.h b/content/browser/geolocation/geolocation_provider_impl.h |
similarity index 84% |
rename from device/geolocation/geolocation_provider_impl.h |
rename to content/browser/geolocation/geolocation_provider_impl.h |
index f21b9dcc5a783bb04f644cc4ee2158462b9e62bf..b7c7e9dcbc9ed7681dad836f2f831a8500e88475 100644 |
--- a/device/geolocation/geolocation_provider_impl.h |
+++ b/content/browser/geolocation/geolocation_provider_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_GEOLOCATION_PROVIDER_IMPL_H_ |
-#define DEVICE_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_ |
+#ifndef CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_ |
+#define CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_ |
#include <list> |
#include <memory> |
@@ -13,19 +13,18 @@ |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
#include "base/threading/thread.h" |
-#include "device/geolocation/geolocation_export.h" |
-#include "device/geolocation/geolocation_provider.h" |
-#include "device/geolocation/geoposition.h" |
+#include "content/common/content_export.h" |
+#include "content/public/browser/geolocation_provider.h" |
+#include "content/public/common/geoposition.h" |
namespace base { |
template<typename Type> struct DefaultSingletonTraits; |
-class SingleThreadTaskRunner; |
} |
-namespace device { |
+namespace content { |
class LocationArbitrator; |
-class DEVICE_GEOLOCATION_EXPORT GeolocationProviderImpl |
+class CONTENT_EXPORT GeolocationProviderImpl |
: public NON_EXPORTED_BASE(GeolocationProvider), |
public base::Thread { |
public: |
@@ -95,12 +94,9 @@ class DEVICE_GEOLOCATION_EXPORT GeolocationProviderImpl |
// Only to be used on the geolocation thread. |
std::unique_ptr<LocationArbitrator> arbitrator_; |
- // Used to PostTask()s from the geolocation thread to creation thread. |
- const scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; |
- |
DISALLOW_COPY_AND_ASSIGN(GeolocationProviderImpl); |
}; |
-} // namespace device |
+} // namespace content |
-#endif // DEVICE_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_ |
+#endif // CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_ |