| Index: device/sensors/sensor_manager_android.h
|
| diff --git a/content/browser/device_sensors/sensor_manager_android.h b/device/sensors/sensor_manager_android.h
|
| similarity index 91%
|
| rename from content/browser/device_sensors/sensor_manager_android.h
|
| rename to device/sensors/sensor_manager_android.h
|
| index 058b6eb1117433d3e6c545efecc8e0ad1796f779..4d299efde3aa8827ce6b4ddcaf82a5855ca0b1ed 100644
|
| --- a/content/browser/device_sensors/sensor_manager_android.h
|
| +++ b/device/sensors/sensor_manager_android.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_DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_
|
| -#define CONTENT_BROWSER_DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_
|
| +#ifndef DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_
|
| +#define DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_
|
|
|
| #include <memory>
|
|
|
| @@ -11,8 +11,8 @@
|
| #include "base/macros.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/thread_checker.h"
|
| -#include "content/browser/device_sensors/device_sensors_consts.h"
|
| -#include "content/common/content_export.h"
|
| +#include "device/sensors/device_sensor_export.h"
|
| +#include "device/sensors/device_sensors_consts.h"
|
| #include "device/sensors/public/cpp/device_light_hardware_buffer.h"
|
| #include "device/sensors/public/cpp/device_motion_hardware_buffer.h"
|
| #include "device/sensors/public/cpp/device_orientation_hardware_buffer.h"
|
| @@ -22,14 +22,14 @@ template <typename T>
|
| struct DefaultSingletonTraits;
|
| }
|
|
|
| -namespace content {
|
| +namespace device {
|
|
|
| // Android implementation of Device {Motion|Orientation|Light} API.
|
| //
|
| // Android's SensorManager has a push API, so when Got*() methods are called
|
| // by the system the browser process puts the received data into a shared
|
| // memory buffer, which is read by the renderer processes.
|
| -class CONTENT_EXPORT SensorManagerAndroid {
|
| +class DEVICE_SENSOR_EXPORT SensorManagerAndroid {
|
| public:
|
| // Must be called at startup, before GetInstance().
|
| static bool Register(JNIEnv* env);
|
| @@ -86,7 +86,7 @@ class CONTENT_EXPORT SensorManagerAndroid {
|
| void Shutdown();
|
|
|
| // A Java counterpart will be generated for this enum.
|
| - // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.content.browser
|
| + // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.device.sensors
|
| // When adding new constants don't modify the order as they are used for UMA.
|
| enum OrientationSensorType {
|
| NOT_AVAILABLE = 0,
|
| @@ -153,6 +153,6 @@ class CONTENT_EXPORT SensorManagerAndroid {
|
| DISALLOW_COPY_AND_ASSIGN(SensorManagerAndroid);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace device
|
|
|
| -#endif // CONTENT_BROWSER_DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_
|
| +#endif // DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_
|
|
|