diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index 633717a58a25ea..675733f6b8cdef 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn @@ -51,6 +51,7 @@ template("implement_content_app") { "//content/public/android:jni", "//device/bluetooth", "//device/gamepad", + "//device/generic_sensor", "//device/geolocation", "//device/power_save_blocker", "//device/sensors", diff --git a/content/app/DEPS b/content/app/DEPS index f4d19c51111f08..c2fd94f8a2f5f1 100644 --- a/content/app/DEPS +++ b/content/app/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+content", "+device/bluetooth", "+device/gamepad", + "+device/generic_sensor", "+device/geolocation", "+device/power_save_blocker", "+device/sensors", diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index 46d1993f85fd7d..7de91d05990070 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -26,6 +26,7 @@ #include "content/public/common/result_codes.h" #include "device/bluetooth/android/bluetooth_jni_registrar.h" #include "device/gamepad/android/gamepad_jni_registrar.h" +#include "device/generic_sensor/android/sensors_jni_registrar.h" #include "device/geolocation/android/geolocation_jni_registrar.h" #include "device/sensors/android/device_sensor_jni_registrar.h" #include "device/usb/android/usb_jni_registrar.h" @@ -89,6 +90,9 @@ bool EnsureJniRegistered(JNIEnv* env) { if (!device::android::RegisterGeolocationJni(env)) return false; + if (!device::android::RegisterSensorsJni(env)) + return false; + if (!device::android::RegisterUsbJni(env)) return false; diff --git a/content/browser/DEPS b/content/browser/DEPS index 23f6f91b696eee..cb6213554c33ac 100644 --- a/content/browser/DEPS +++ b/content/browser/DEPS @@ -21,6 +21,7 @@ include_rules = [ "+content/app/strings/grit", # For generated headers "+content/public/browser", "+device/gamepad", # For gamepad API + "+device/generic_sensor", # For sensors service. "+device/geolocation", "+device/nfc", "+device/power_save_blocker", diff --git a/content/browser/generic_sensor_browsertest.cc b/content/browser/generic_sensor_browsertest.cc index 652d7ae8440860..745cbfea746929 100644 --- a/content/browser/generic_sensor_browsertest.cc +++ b/content/browser/generic_sensor_browsertest.cc @@ -17,9 +17,9 @@ #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_javascript_dialog_manager.h" -#include "services/device/generic_sensor/platform_sensor.h" -#include "services/device/generic_sensor/platform_sensor_provider.h" -#include "services/device/generic_sensor/sensor_provider_impl.h" +#include "device/generic_sensor/platform_sensor.h" +#include "device/generic_sensor/platform_sensor_provider.h" +#include "device/generic_sensor/sensor_provider_impl.h" namespace content { diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn index 2f78b255600745..43101106088711 100644 --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn @@ -36,6 +36,7 @@ android_library("content_java") { "//base:base_java", "//device/bluetooth:java", "//device/gamepad:java", + "//device/generic_sensor:java", "//device/nfc:mojo_bindings_java", "//device/nfc/public/java:nfc_java", "//device/power_save_blocker:java", diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index bf713c590f9eb7..4547fea8c5a3e2 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -758,6 +758,7 @@ test("content_browsertests") { "//content/shell:pak", "//content/test:test_support", "//device/base/synchronization", + "//device/generic_sensor", "//device/power_save_blocker", "//device/screen_orientation/public/interfaces", "//device/sensors", @@ -778,7 +779,6 @@ test("content_browsertests") { "//net:test_support", "//ppapi/features", "//services/catalog:lib", - "//services/device/generic_sensor", "//services/device/public/interfaces", "//services/device/public/interfaces:constants", "//services/service_manager/public/cpp", diff --git a/device/BUILD.gn b/device/BUILD.gn index fccb04ddaf1b68..1d42690ffddeee 100644 --- a/device/BUILD.gn +++ b/device/BUILD.gn @@ -67,6 +67,8 @@ test("device_unittests") { "gamepad/gamepad_provider_unittest.cc", "gamepad/gamepad_service_unittest.cc", "gamepad/public/interfaces/gamepad_struct_traits_unittest.cc", + "generic_sensor/platform_sensor_and_provider_unittest_win.cc", + "generic_sensor/platform_sensor_provider_unittest.cc", "sensors/data_fetcher_shared_memory_base_unittest.cc", "sensors/sensor_manager_android_unittest.cc", "sensors/sensor_manager_chromeos_unittest.cc", @@ -86,6 +88,8 @@ test("device_unittests") { "//device/gamepad/public/cpp:shared_with_blink", "//device/gamepad/public/interfaces", "//device/gamepad/public/interfaces:gamepad_struct_traits_test", + "//device/generic_sensor", + "//device/generic_sensor:testing", "//device/geolocation:unittests", "//device/power_save_blocker", "//device/sensors", @@ -103,6 +107,11 @@ test("device_unittests") { "//url", ] + if (!is_linux_without_udev) { + sources += + [ "generic_sensor/platform_sensor_and_provider_unittest_linux.cc" ] + } + # HID and Serial: # Android doesn't compile. # Linux, requires udev. @@ -238,6 +247,12 @@ test("device_unittests") { "bluetooth/bluetooth_low_energy_win_fake.cc", "bluetooth/bluetooth_low_energy_win_fake.h", ] + + # Needed for "generic_sensor/platform_sensor_and_provider_unittest_win.cc" + libs = [ + "propsys.lib", + "sensorsapi.lib", + ] } if (enable_vr) { diff --git a/services/device/generic_sensor/BUILD.gn b/device/generic_sensor/BUILD.gn similarity index 93% rename from services/device/generic_sensor/BUILD.gn rename to device/generic_sensor/BUILD.gn index d0598ec25c847b..f95b0a1b20ca51 100644 --- a/services/device/generic_sensor/BUILD.gn +++ b/device/generic_sensor/BUILD.gn @@ -8,10 +8,11 @@ if (is_android) { import("//build/config/android/rules.gni") # For generate_jni(). } -source_set("generic_sensor") { +component("generic_sensor") { output_name = "generic_sensor" sources = [ "generic_sensor_consts.h", + "generic_sensor_export.h", "linux/sensor_data_linux.cc", "linux/sensor_data_linux.h", "platform_sensor.cc", @@ -46,13 +47,15 @@ source_set("generic_sensor") { "sensor_provider_impl.h", ] + defines = [ "DEVICE_GENERIC_SENSOR_IMPLEMENTATION" ] + deps = [ "//base", "//device/base/synchronization", ] public_deps = [ - "//services/device/public/cpp/generic_sensor", + "//device/generic_sensor/public/cpp", ] if (is_android) { @@ -113,7 +116,7 @@ if (is_android) { deps = [ "//base:base_java", - "//services/device/public/interfaces:generic_sensor_java", + "//device/generic_sensor/public/interfaces:interfaces_java", ] } } diff --git a/services/device/generic_sensor/DEPS b/device/generic_sensor/DEPS similarity index 100% rename from services/device/generic_sensor/DEPS rename to device/generic_sensor/DEPS diff --git a/services/device/generic_sensor/OWNERS b/device/generic_sensor/OWNERS similarity index 100% rename from services/device/generic_sensor/OWNERS rename to device/generic_sensor/OWNERS diff --git a/services/device/generic_sensor/README.md b/device/generic_sensor/README.md similarity index 95% rename from services/device/generic_sensor/README.md rename to device/generic_sensor/README.md index 8e10d1341559e3..e1842f971abc9b 100644 --- a/services/device/generic_sensor/README.md +++ b/device/generic_sensor/README.md @@ -1,9 +1,9 @@ # Sensors -`services/device/generic_sensor` contains the platform-specific parts of the Sensor APIs +`device/generic_sensor` contains the platform-specific parts of the Sensor APIs implementation. -Sensors Mojo interfaces are defined in the `services/public/interfaces` subdirectory. +Sensors Mojo interfaces are defined in the `public/interfaces` subdirectory. The JS bindings are implemented in `third_party/WebKit/Source/modules/sensor`. diff --git a/services/device/generic_sensor/android/java/src/org/chromium/device/sensors/PlatformSensor.java b/device/generic_sensor/android/java/src/org/chromium/device/sensors/PlatformSensor.java similarity index 100% rename from services/device/generic_sensor/android/java/src/org/chromium/device/sensors/PlatformSensor.java rename to device/generic_sensor/android/java/src/org/chromium/device/sensors/PlatformSensor.java diff --git a/services/device/generic_sensor/android/java/src/org/chromium/device/sensors/PlatformSensorProvider.java b/device/generic_sensor/android/java/src/org/chromium/device/sensors/PlatformSensorProvider.java similarity index 100% rename from services/device/generic_sensor/android/java/src/org/chromium/device/sensors/PlatformSensorProvider.java rename to device/generic_sensor/android/java/src/org/chromium/device/sensors/PlatformSensorProvider.java diff --git a/services/device/generic_sensor/android/sensors_jni_registrar.cc b/device/generic_sensor/android/sensors_jni_registrar.cc similarity index 82% rename from services/device/generic_sensor/android/sensors_jni_registrar.cc rename to device/generic_sensor/android/sensors_jni_registrar.cc index b34e7b8bc9d886..ca5c8aa501df70 100644 --- a/services/device/generic_sensor/android/sensors_jni_registrar.cc +++ b/device/generic_sensor/android/sensors_jni_registrar.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/android/sensors_jni_registrar.h" +#include "device/generic_sensor/android/sensors_jni_registrar.h" #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" -#include "services/device/generic_sensor/platform_sensor_android.h" +#include "device/generic_sensor/platform_sensor_android.h" namespace device { namespace android { diff --git a/services/device/generic_sensor/android/sensors_jni_registrar.h b/device/generic_sensor/android/sensors_jni_registrar.h similarity index 60% rename from services/device/generic_sensor/android/sensors_jni_registrar.h rename to device/generic_sensor/android/sensors_jni_registrar.h index c16a9e9af0f75f..e10738d61601a7 100644 --- a/services/device/generic_sensor/android/sensors_jni_registrar.h +++ b/device/generic_sensor/android/sensors_jni_registrar.h @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_ +#ifndef DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_ +#define DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_ #include +#include "device/generic_sensor/generic_sensor_export.h" + namespace device { namespace android { @@ -14,9 +16,9 @@ namespace android { // See https://www.chromium.org/developers/design-documents/android-jni // // Must be called before classes in the Sensors module are used. -bool RegisterSensorsJni(JNIEnv* env); +bool DEVICE_GENERIC_SENSOR_EXPORT RegisterSensorsJni(JNIEnv* env); } // namespace android } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_ +#endif // DEVICE_GENERIC_SENSOR_ANDROID_SENSORS_JNI_REGISTRAR_H_ diff --git a/services/device/generic_sensor/fake_platform_sensor.cc b/device/generic_sensor/fake_platform_sensor.cc similarity index 94% rename from services/device/generic_sensor/fake_platform_sensor.cc rename to device/generic_sensor/fake_platform_sensor.cc index e9b50fc625df21..1e0b27b6e920da 100644 --- a/services/device/generic_sensor/fake_platform_sensor.cc +++ b/device/generic_sensor/fake_platform_sensor.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/fake_platform_sensor.h" +#include "device/generic_sensor/fake_platform_sensor.h" namespace device { diff --git a/services/device/generic_sensor/fake_platform_sensor.h b/device/generic_sensor/fake_platform_sensor.h similarity index 82% rename from services/device/generic_sensor/fake_platform_sensor.h rename to device/generic_sensor/fake_platform_sensor.h index 398aaac875e676..3558c73b836bc5 100644 --- a/services/device/generic_sensor/fake_platform_sensor.h +++ b/device/generic_sensor/fake_platform_sensor.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_FAKE_PLATFORM_SENSOR_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_FAKE_PLATFORM_SENSOR_H_ +#ifndef DEVICE_GENERIC_SENSOR_FAKE_PLATFORM_SENSOR_H_ +#define DEVICE_GENERIC_SENSOR_FAKE_PLATFORM_SENSOR_H_ -#include "services/device/generic_sensor/platform_sensor.h" +#include "device/generic_sensor/platform_sensor.h" namespace device { @@ -43,4 +43,4 @@ class FakePlatformSensor : public PlatformSensor { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_FAKE_PLATFORM_SENSOR_H +#endif // DEVICE_GENERIC_SENSOR_FAKE_PLATFORM_SENSOR_H diff --git a/services/device/generic_sensor/fake_platform_sensor_provider.cc b/device/generic_sensor/fake_platform_sensor_provider.cc similarity index 83% rename from services/device/generic_sensor/fake_platform_sensor_provider.cc rename to device/generic_sensor/fake_platform_sensor_provider.cc index db7acfb322cb86..7600c35e8eb489 100644 --- a/services/device/generic_sensor/fake_platform_sensor_provider.cc +++ b/device/generic_sensor/fake_platform_sensor_provider.cc @@ -4,8 +4,8 @@ #include "base/memory/singleton.h" -#include "services/device/generic_sensor/fake_platform_sensor.h" -#include "services/device/generic_sensor/fake_platform_sensor_provider.h" +#include "device/generic_sensor/fake_platform_sensor.h" +#include "device/generic_sensor/fake_platform_sensor_provider.h" namespace device { diff --git a/services/device/generic_sensor/fake_platform_sensor_provider.h b/device/generic_sensor/fake_platform_sensor_provider.h similarity index 71% rename from services/device/generic_sensor/fake_platform_sensor_provider.h rename to device/generic_sensor/fake_platform_sensor_provider.h index 40f27d915b1c31..8ffd3b32ad461f 100644 --- a/services/device/generic_sensor/fake_platform_sensor_provider.h +++ b/device/generic_sensor/fake_platform_sensor_provider.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_FAKE_PLATFORM_SENSOR_PROVIDER_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_FAKE_PLATFORM_SENSOR_PROVIDER_H_ +#ifndef DEVICE_GENERIC_SENSOR_FAKE_PLATFORM_SENSOR_PROVIDER_H_ +#define DEVICE_GENERIC_SENSOR_FAKE_PLATFORM_SENSOR_PROVIDER_H_ -#include "services/device/generic_sensor/platform_sensor_provider.h" +#include "device/generic_sensor/platform_sensor_provider.h" #include "testing/gmock/include/gmock/gmock.h" namespace device { @@ -28,4 +28,4 @@ class FakePlatformSensorProvider : public PlatformSensorProvider { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_MOCK_PLATFORM_SENSOR_PROVIDER_H_ +#endif // DEVICE_GENERIC_SENSOR_MOCK_PLATFORM_SENSOR_PROVIDER_H_ diff --git a/services/device/generic_sensor/generic_sensor_consts.h b/device/generic_sensor/generic_sensor_consts.h similarity index 84% rename from services/device/generic_sensor/generic_sensor_consts.h rename to device/generic_sensor/generic_sensor_consts.h index ba4b959f0f7a32..ca9b45a4cd1ae7 100644 --- a/services/device/generic_sensor/generic_sensor_consts.h +++ b/device/generic_sensor/generic_sensor_consts.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 SERVICES_DEVICE_GENERIC_SENSOR_GENERIC_SENSOR_CONSTS_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_GENERIC_SENSOR_CONSTS_H_ +#ifndef DEVICE_GENERIC_SENSOR_GENERIC_SENSOR_CONSTS_H_ +#define DEVICE_GENERIC_SENSOR_GENERIC_SENSOR_CONSTS_H_ #define _USE_MATH_DEFINES #include @@ -36,4 +36,4 @@ constexpr int kDefaultMagnetometerFrequencyHz = 10; } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_GENERIC_SENSOR_CONSTS_H_ +#endif // DEVICE_GENERIC_SENSOR_GENERIC_SENSOR_CONSTS_H_ diff --git a/device/generic_sensor/generic_sensor_export.h b/device/generic_sensor/generic_sensor_export.h new file mode 100644 index 00000000000000..c019b0caf08dab --- /dev/null +++ b/device/generic_sensor/generic_sensor_export.h @@ -0,0 +1,29 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef DEVICE_GENERIC_SENSOR_GENERIC_SENSOR_EXPORT_H_ +#define DEVICE_GENERIC_SENSOR_GENERIC_SENSOR_EXPORT_H_ + +#if defined(COMPONENT_BUILD) +#if defined(WIN32) + +#if defined(DEVICE_GENERIC_SENSOR_IMPLEMENTATION) +#define DEVICE_GENERIC_SENSOR_EXPORT __declspec(dllexport) +#else +#define DEVICE_GENERIC_SENSOR_EXPORT __declspec(dllimport) +#endif // defined(DEVICE_GENERIC_SENSOR_IMPLEMENTATION) + +#else // defined(WIN32) +#if defined(DEVICE_GENERIC_SENSOR_IMPLEMENTATION) +#define DEVICE_GENERIC_SENSOR_EXPORT __attribute__((visibility("default"))) +#else +#define DEVICE_GENERIC_SENSOR_EXPORT +#endif +#endif + +#else // defined(COMPONENT_BUILD) +#define DEVICE_GENERIC_SENSOR_EXPORT +#endif + +#endif // DEVICE_GENERIC_SENSOR_GENERIC_SENSOR_EXPORT_H_ diff --git a/services/device/generic_sensor/linux/sensor_data_linux.cc b/device/generic_sensor/linux/sensor_data_linux.cc similarity index 97% rename from services/device/generic_sensor/linux/sensor_data_linux.cc rename to device/generic_sensor/linux/sensor_data_linux.cc index 89826763f07156..8e506a918a9051 100644 --- a/services/device/generic_sensor/linux/sensor_data_linux.cc +++ b/device/generic_sensor/linux/sensor_data_linux.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/linux/sensor_data_linux.h" #include "base/sys_info.h" #include "base/version.h" -#include "services/device/generic_sensor/generic_sensor_consts.h" -#include "services/device/public/cpp/generic_sensor/sensor_reading.h" +#include "device/generic_sensor/generic_sensor_consts.h" +#include "device/generic_sensor/linux/sensor_data_linux.h" +#include "device/generic_sensor/public/cpp/sensor_reading.h" namespace device { diff --git a/services/device/generic_sensor/linux/sensor_data_linux.h b/device/generic_sensor/linux/sensor_data_linux.h similarity index 85% rename from services/device/generic_sensor/linux/sensor_data_linux.h rename to device/generic_sensor/linux/sensor_data_linux.h index 3e485b9572c619..5f82898b93f4a4 100644 --- a/services/device/generic_sensor/linux/sensor_data_linux.h +++ b/device/generic_sensor/linux/sensor_data_linux.h @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_ +#ifndef DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_ +#define DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_ -#include "services/device/public/interfaces/sensor.mojom.h" +#include "device/generic_sensor/generic_sensor_export.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom.h" namespace device { @@ -17,7 +18,7 @@ struct SensorReading; // SensorDeviceManager receives a udev device, it uses this structure to // identify what type of sensor that is and creates a SensorInfoLinux structure // that holds all the necessary information to create a PlatformSensorLinux. -struct SensorPathsLinux { +struct DEVICE_GENERIC_SENSOR_EXPORT SensorPathsLinux { using ReaderFunctor = base::Callback< void(double scaling, double offset, SensorReading& reading)>; @@ -43,7 +44,8 @@ struct SensorPathsLinux { }; // Initializes sensor data according to |type|. -bool InitSensorData(mojom::SensorType type, SensorPathsLinux* data); +bool DEVICE_GENERIC_SENSOR_EXPORT InitSensorData(mojom::SensorType type, + SensorPathsLinux* data); // This structure represents an iio device, which info is taken // from udev service. If a client requests a sensor from a provider, @@ -77,4 +79,4 @@ struct SensorInfoLinux { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_ +#endif // DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_ diff --git a/services/device/generic_sensor/linux/sensor_device_manager.cc b/device/generic_sensor/linux/sensor_device_manager.cc similarity index 97% rename from services/device/generic_sensor/linux/sensor_device_manager.cc rename to device/generic_sensor/linux/sensor_device_manager.cc index 3771a9a54c3f4a..fb4ca88df15d27 100644 --- a/services/device/generic_sensor/linux/sensor_device_manager.cc +++ b/device/generic_sensor/linux/sensor_device_manager.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/linux/sensor_device_manager.h" +#include "device/generic_sensor/linux/sensor_device_manager.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" -#include "services/device/generic_sensor/linux/sensor_data_linux.h" +#include "device/generic_sensor/linux/sensor_data_linux.h" namespace device { diff --git a/services/device/generic_sensor/linux/sensor_device_manager.h b/device/generic_sensor/linux/sensor_device_manager.h similarity index 86% rename from services/device/generic_sensor/linux/sensor_device_manager.h rename to device/generic_sensor/linux/sensor_device_manager.h index 4d39f7c74431ad..937e8e54e35d9c 100644 --- a/services/device/generic_sensor/linux/sensor_device_manager.h +++ b/device/generic_sensor/linux/sensor_device_manager.h @@ -2,14 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_ +#ifndef DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_ +#define DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_ #include "base/scoped_observer.h" #include "base/single_thread_task_runner.h" #include "device/base/device_monitor_linux.h" -#include "services/device/public/interfaces/sensor.mojom.h" +#include "device/generic_sensor/generic_sensor_export.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom.h" namespace device { @@ -19,7 +20,8 @@ struct SensorInfoLinux; // and listen to "add/removed" events to notify |provider_| about // added or removed iio devices. It has own cache to speed up an identification // process of removed devices. -class SensorDeviceManager : public DeviceMonitorLinux::Observer { +class DEVICE_GENERIC_SENSOR_EXPORT SensorDeviceManager + : public DeviceMonitorLinux::Observer { public: class Delegate { public: @@ -81,4 +83,4 @@ class SensorDeviceManager : public DeviceMonitorLinux::Observer { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_ +#endif // DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DEVICE_MANAGER_H_ diff --git a/services/device/generic_sensor/platform_sensor.cc b/device/generic_sensor/platform_sensor.cc similarity index 94% rename from services/device/generic_sensor/platform_sensor.cc rename to device/generic_sensor/platform_sensor.cc index cb78c97bc0187d..34afa2d69987ab 100644 --- a/services/device/generic_sensor/platform_sensor.cc +++ b/device/generic_sensor/platform_sensor.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor.h" +#include "device/generic_sensor/platform_sensor.h" #include #include "base/threading/thread_task_runner_handle.h" -#include "services/device/generic_sensor/platform_sensor_provider.h" -#include "services/device/public/cpp/generic_sensor/platform_sensor_configuration.h" +#include "device/generic_sensor/platform_sensor_provider.h" +#include "device/generic_sensor/public/cpp/platform_sensor_configuration.h" namespace device { diff --git a/services/device/generic_sensor/platform_sensor.h b/device/generic_sensor/platform_sensor.h similarity index 88% rename from services/device/generic_sensor/platform_sensor.h rename to device/generic_sensor/platform_sensor.h index 1e3847e0e9a470..94629a552b9d9a 100644 --- a/services/device/generic_sensor/platform_sensor.h +++ b/device/generic_sensor/platform_sensor.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 SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_ #include #include @@ -13,9 +13,10 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/single_thread_task_runner.h" +#include "device/generic_sensor/generic_sensor_export.h" +#include "device/generic_sensor/public/cpp/sensor_reading.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom.h" #include "mojo/public/cpp/system/buffer.h" -#include "services/device/public/cpp/generic_sensor/sensor_reading.h" -#include "services/device/public/interfaces/sensor.mojom.h" namespace device { @@ -24,7 +25,8 @@ class PlatformSensorConfiguration; // Base class for the sensors provided by the platform. Concrete instances of // this class are created by platform specific PlatformSensorProvider. -class PlatformSensor : public base::RefCountedThreadSafe { +class DEVICE_GENERIC_SENSOR_EXPORT PlatformSensor + : public base::RefCountedThreadSafe { public: // The interface that must be implemented by PlatformSensor clients. class Client { @@ -106,4 +108,4 @@ class PlatformSensor : public base::RefCountedThreadSafe { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_H_ diff --git a/services/device/generic_sensor/platform_sensor_accelerometer_mac.cc b/device/generic_sensor/platform_sensor_accelerometer_mac.cc similarity index 93% rename from services/device/generic_sensor/platform_sensor_accelerometer_mac.cc rename to device/generic_sensor/platform_sensor_accelerometer_mac.cc index 4ca3b61574b719..19a7f2969ef1c1 100644 --- a/services/device/generic_sensor/platform_sensor_accelerometer_mac.cc +++ b/device/generic_sensor/platform_sensor_accelerometer_mac.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_accelerometer_mac.h" +#include "device/generic_sensor/platform_sensor_accelerometer_mac.h" #include @@ -10,8 +10,8 @@ #include "base/bind.h" #include "device/base/synchronization/shared_memory_seqlock_buffer.h" -#include "services/device/generic_sensor/generic_sensor_consts.h" -#include "services/device/generic_sensor/platform_sensor_provider_mac.h" +#include "device/generic_sensor/generic_sensor_consts.h" +#include "device/generic_sensor/platform_sensor_provider_mac.h" #include "third_party/sudden_motion_sensor/sudden_motion_sensor_mac.h" namespace { diff --git a/services/device/generic_sensor/platform_sensor_accelerometer_mac.h b/device/generic_sensor/platform_sensor_accelerometer_mac.h similarity index 84% rename from services/device/generic_sensor/platform_sensor_accelerometer_mac.h rename to device/generic_sensor/platform_sensor_accelerometer_mac.h index 41a662ca69f3d4..02e08b5d1a8dfc 100644 --- a/services/device/generic_sensor/platform_sensor_accelerometer_mac.h +++ b/device/generic_sensor/platform_sensor_accelerometer_mac.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ACCELEROMETER_MAC_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ACCELEROMETER_MAC_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ACCELEROMETER_MAC_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ACCELEROMETER_MAC_H_ #include #include "base/timer/timer.h" -#include "services/device/generic_sensor/platform_sensor.h" +#include "device/generic_sensor/platform_sensor.h" class SuddenMotionSensor; @@ -52,4 +52,4 @@ class PlatformSensorAccelerometerMac : public PlatformSensor { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ACCELEROMETER_MAC_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ACCELEROMETER_MAC_H_ diff --git a/services/device/generic_sensor/platform_sensor_ambient_light_mac.cc b/device/generic_sensor/platform_sensor_ambient_light_mac.cc similarity index 96% rename from services/device/generic_sensor/platform_sensor_ambient_light_mac.cc rename to device/generic_sensor/platform_sensor_ambient_light_mac.cc index e60ced344d49b1..8a72acf7d6d610 100644 --- a/services/device/generic_sensor/platform_sensor_ambient_light_mac.cc +++ b/device/generic_sensor/platform_sensor_ambient_light_mac.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_ambient_light_mac.h" +#include "device/generic_sensor/platform_sensor_ambient_light_mac.h" #include @@ -10,8 +10,8 @@ #include "base/bind.h" #include "device/base/synchronization/shared_memory_seqlock_buffer.h" -#include "services/device/generic_sensor/generic_sensor_consts.h" -#include "services/device/generic_sensor/platform_sensor_provider_mac.h" +#include "device/generic_sensor/generic_sensor_consts.h" +#include "device/generic_sensor/platform_sensor_provider_mac.h" namespace { diff --git a/services/device/generic_sensor/platform_sensor_ambient_light_mac.h b/device/generic_sensor/platform_sensor_ambient_light_mac.h similarity index 97% rename from services/device/generic_sensor/platform_sensor_ambient_light_mac.h rename to device/generic_sensor/platform_sensor_ambient_light_mac.h index 86c4871e2a45f5..649b32ec3eadd4 100644 --- a/services/device/generic_sensor/platform_sensor_ambient_light_mac.h +++ b/device/generic_sensor/platform_sensor_ambient_light_mac.h @@ -9,7 +9,7 @@ #include "base/mac/scoped_ionotificationportref.h" #include "base/mac/scoped_ioobject.h" -#include "services/device/generic_sensor/platform_sensor.h" +#include "device/generic_sensor/platform_sensor.h" namespace device { diff --git a/services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc b/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc similarity index 98% rename from services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc rename to device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc index 9e1b94cbe46b0a..907d12c2ec6764 100644 --- a/services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc +++ b/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc @@ -10,10 +10,10 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/threading/thread_task_runner_handle.h" -#include "services/device/generic_sensor/generic_sensor_consts.h" -#include "services/device/generic_sensor/linux/sensor_data_linux.h" -#include "services/device/generic_sensor/linux/sensor_device_manager.h" -#include "services/device/generic_sensor/platform_sensor_provider_linux.h" +#include "device/generic_sensor/generic_sensor_consts.h" +#include "device/generic_sensor/linux/sensor_data_linux.h" +#include "device/generic_sensor/linux/sensor_device_manager.h" +#include "device/generic_sensor/platform_sensor_provider_linux.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc b/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc similarity index 99% rename from services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc rename to device/generic_sensor/platform_sensor_and_provider_unittest_win.cc index 8bf01e83ab5cf9..fbe917fe68b439 100644 --- a/services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc +++ b/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc @@ -13,9 +13,9 @@ #include "base/run_loop.h" #include "base/win/iunknown_impl.h" #include "base/win/scoped_propvariant.h" -#include "services/device/generic_sensor/generic_sensor_consts.h" -#include "services/device/generic_sensor/platform_sensor_provider_win.h" -#include "services/device/public/interfaces/sensor_provider.mojom.h" +#include "device/generic_sensor/generic_sensor_consts.h" +#include "device/generic_sensor/platform_sensor_provider_win.h" +#include "device/generic_sensor/public/interfaces/sensor_provider.mojom.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/services/device/generic_sensor/platform_sensor_android.cc b/device/generic_sensor/platform_sensor_android.cc similarity index 97% rename from services/device/generic_sensor/platform_sensor_android.cc rename to device/generic_sensor/platform_sensor_android.cc index 7d73381e0e7028..10e3f6c1383bd6 100644 --- a/services/device/generic_sensor/platform_sensor_android.cc +++ b/device/generic_sensor/platform_sensor_android.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_android.h" +#include "device/generic_sensor/platform_sensor_android.h" #include "base/bind.h" #include "jni/PlatformSensor_jni.h" diff --git a/services/device/generic_sensor/platform_sensor_android.h b/device/generic_sensor/platform_sensor_android.h similarity index 86% rename from services/device/generic_sensor/platform_sensor_android.h rename to device/generic_sensor/platform_sensor_android.h index af0ed125104e05..48937e0b453be5 100644 --- a/services/device/generic_sensor/platform_sensor_android.h +++ b/device/generic_sensor/platform_sensor_android.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ANDROID_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ANDROID_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ANDROID_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ANDROID_H_ +#include "device/generic_sensor/platform_sensor.h" #include "base/android/scoped_java_ref.h" #include "base/memory/ref_counted.h" -#include "services/device/generic_sensor/platform_sensor.h" namespace device { @@ -52,4 +52,4 @@ class PlatformSensorAndroid : public PlatformSensor { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ANDROID_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_ANDROID_H_ diff --git a/services/device/generic_sensor/platform_sensor_linux.cc b/device/generic_sensor/platform_sensor_linux.cc similarity index 93% rename from services/device/generic_sensor/platform_sensor_linux.cc rename to device/generic_sensor/platform_sensor_linux.cc index 9c6ca713d0ddb5..5d3e07bdeafa6b 100644 --- a/services/device/generic_sensor/platform_sensor_linux.cc +++ b/device/generic_sensor/platform_sensor_linux.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_linux.h" +#include "device/generic_sensor/platform_sensor_linux.h" #include "base/single_thread_task_runner.h" -#include "services/device/generic_sensor/linux/sensor_data_linux.h" -#include "services/device/generic_sensor/platform_sensor_reader_linux.h" +#include "device/generic_sensor/linux/sensor_data_linux.h" +#include "device/generic_sensor/platform_sensor_reader_linux.h" namespace device { diff --git a/services/device/generic_sensor/platform_sensor_linux.h b/device/generic_sensor/platform_sensor_linux.h similarity index 87% rename from services/device/generic_sensor/platform_sensor_linux.h rename to device/generic_sensor/platform_sensor_linux.h index 310c8a17beec2a..9442b0c0b61319 100644 --- a/services/device/generic_sensor/platform_sensor_linux.h +++ b/device/generic_sensor/platform_sensor_linux.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_LINUX_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_LINUX_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_LINUX_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_LINUX_H_ -#include "services/device/generic_sensor/platform_sensor.h" +#include "device/generic_sensor/platform_sensor.h" namespace base { class SingleThreadTaskRunner; @@ -63,4 +63,4 @@ class PlatformSensorLinux : public PlatformSensor { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_LINUX_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_LINUX_H_ diff --git a/services/device/generic_sensor/platform_sensor_provider.cc b/device/generic_sensor/platform_sensor_provider.cc similarity index 74% rename from services/device/generic_sensor/platform_sensor_provider.cc rename to device/generic_sensor/platform_sensor_provider.cc index c7cc03f8240114..e7749e18050676 100644 --- a/services/device/generic_sensor/platform_sensor_provider.cc +++ b/device/generic_sensor/platform_sensor_provider.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_provider.h" +#include "device/generic_sensor/platform_sensor_provider.h" #if defined(OS_MACOSX) -#include "services/device/generic_sensor/platform_sensor_provider_mac.h" +#include "device/generic_sensor/platform_sensor_provider_mac.h" #elif defined(OS_ANDROID) -#include "services/device/generic_sensor/platform_sensor_provider_android.h" +#include "device/generic_sensor/platform_sensor_provider_android.h" #elif defined(OS_WIN) -#include "services/device/generic_sensor/platform_sensor_provider_win.h" +#include "device/generic_sensor/platform_sensor_provider_win.h" #elif defined(OS_LINUX) && defined(USE_UDEV) -#include "services/device/generic_sensor/platform_sensor_provider_linux.h" +#include "device/generic_sensor/platform_sensor_provider_linux.h" #endif namespace { diff --git a/services/device/generic_sensor/platform_sensor_provider.h b/device/generic_sensor/platform_sensor_provider.h similarity index 70% rename from services/device/generic_sensor/platform_sensor_provider.h rename to device/generic_sensor/platform_sensor_provider.h index e9777f95aa420f..69007346891ebc 100644 --- a/services/device/generic_sensor/platform_sensor_provider.h +++ b/device/generic_sensor/platform_sensor_provider.h @@ -2,16 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_H_ -#include "services/device/generic_sensor/platform_sensor_provider_base.h" +#include "device/generic_sensor/generic_sensor_export.h" +#include "device/generic_sensor/platform_sensor_provider_base.h" namespace device { // This a singleton class returning the actual sensor provider // implementation for the current platform. -class PlatformSensorProvider : public PlatformSensorProviderBase { +class DEVICE_GENERIC_SENSOR_EXPORT PlatformSensorProvider + : public PlatformSensorProviderBase { public: // Returns the PlatformSensorProvider singleton. // Note: returns 'nullptr' if there is no available implementation for @@ -32,4 +34,4 @@ class PlatformSensorProvider : public PlatformSensorProviderBase { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_H_ diff --git a/services/device/generic_sensor/platform_sensor_provider_android.cc b/device/generic_sensor/platform_sensor_provider_android.cc similarity index 91% rename from services/device/generic_sensor/platform_sensor_provider_android.cc rename to device/generic_sensor/platform_sensor_provider_android.cc index 0c60a1beeb4dc8..05a008a2cfb398 100644 --- a/services/device/generic_sensor/platform_sensor_provider_android.cc +++ b/device/generic_sensor/platform_sensor_provider_android.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_provider_android.h" +#include "device/generic_sensor/platform_sensor_provider_android.h" #include "base/android/scoped_java_ref.h" #include "base/memory/singleton.h" +#include "device/generic_sensor/platform_sensor_android.h" #include "jni/PlatformSensorProvider_jni.h" -#include "services/device/generic_sensor/platform_sensor_android.h" using base::android::AttachCurrentThread; using base::android::ScopedJavaLocalRef; diff --git a/services/device/generic_sensor/platform_sensor_provider_android.h b/device/generic_sensor/platform_sensor_provider_android.h similarity index 74% rename from services/device/generic_sensor/platform_sensor_provider_android.h rename to device/generic_sensor/platform_sensor_provider_android.h index 5a1610bef73e0f..ea2212b3004790 100644 --- a/services/device/generic_sensor/platform_sensor_provider_android.h +++ b/device/generic_sensor/platform_sensor_provider_android.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_ANDROID_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_ANDROID_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_ANDROID_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_ANDROID_H_ -#include "services/device/generic_sensor/platform_sensor_provider.h" +#include "device/generic_sensor/platform_sensor_provider.h" #include "base/android/scoped_java_ref.h" @@ -32,4 +32,4 @@ class PlatformSensorProviderAndroid : public PlatformSensorProvider { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_ANDROID_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_ANDROID_H_ diff --git a/services/device/generic_sensor/platform_sensor_provider_base.cc b/device/generic_sensor/platform_sensor_provider_base.cc similarity index 96% rename from services/device/generic_sensor/platform_sensor_provider_base.cc rename to device/generic_sensor/platform_sensor_provider_base.cc index 463eb643f399ff..8af22ed5891d5d 100644 --- a/services/device/generic_sensor/platform_sensor_provider_base.cc +++ b/device/generic_sensor/platform_sensor_provider_base.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_provider_base.h" +#include "device/generic_sensor/platform_sensor_provider_base.h" #include #include "base/stl_util.h" -#include "services/device/public/interfaces/sensor_provider.mojom.h" +#include "device/generic_sensor/public/interfaces/sensor_provider.mojom.h" namespace device { diff --git a/services/device/generic_sensor/platform_sensor_provider_base.h b/device/generic_sensor/platform_sensor_provider_base.h similarity index 87% rename from services/device/generic_sensor/platform_sensor_provider_base.h rename to device/generic_sensor/platform_sensor_provider_base.h index 77926f78c2fe11..c38443bee899d5 100644 --- a/services/device/generic_sensor/platform_sensor_provider_base.h +++ b/device/generic_sensor/platform_sensor_provider_base.h @@ -2,20 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_BASE_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_BASE_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_BASE_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_BASE_H_ #include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread_checker.h" -#include "services/device/generic_sensor/platform_sensor.h" +#include "device/generic_sensor/generic_sensor_export.h" +#include "device/generic_sensor/platform_sensor.h" namespace device { // Base class that defines factory methods for PlatformSensor creation. // Its implementations must be accessed via GetInstance() method. -class PlatformSensorProviderBase { +class DEVICE_GENERIC_SENSOR_EXPORT PlatformSensorProviderBase { public: using CreateSensorCallback = base::Callback)>; @@ -80,4 +81,4 @@ class PlatformSensorProviderBase { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_BASE_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_BASE_H_ diff --git a/services/device/generic_sensor/platform_sensor_provider_linux.cc b/device/generic_sensor/platform_sensor_provider_linux.cc similarity index 96% rename from services/device/generic_sensor/platform_sensor_provider_linux.cc rename to device/generic_sensor/platform_sensor_provider_linux.cc index 025cc5937ebf40..4db2a4c97e47fa 100644 --- a/services/device/generic_sensor/platform_sensor_provider_linux.cc +++ b/device/generic_sensor/platform_sensor_provider_linux.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_provider_linux.h" +#include "device/generic_sensor/platform_sensor_provider_linux.h" #include "base/memory/singleton.h" #include "base/message_loop/message_loop.h" #include "base/task_runner_util.h" #include "base/threading/thread.h" -#include "services/device/generic_sensor/linux/sensor_data_linux.h" -#include "services/device/generic_sensor/platform_sensor_linux.h" -#include "services/device/generic_sensor/platform_sensor_reader_linux.h" +#include "device/generic_sensor/linux/sensor_data_linux.h" +#include "device/generic_sensor/platform_sensor_linux.h" +#include "device/generic_sensor/platform_sensor_reader_linux.h" namespace device { diff --git a/services/device/generic_sensor/platform_sensor_provider_linux.h b/device/generic_sensor/platform_sensor_provider_linux.h similarity index 87% rename from services/device/generic_sensor/platform_sensor_provider_linux.h rename to device/generic_sensor/platform_sensor_provider_linux.h index b11d6639a7e73d..5bde10fbb38d5d 100644 --- a/services/device/generic_sensor/platform_sensor_provider_linux.h +++ b/device/generic_sensor/platform_sensor_provider_linux.h @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PUBLIC_PLATFORM_SENSOR_PROVIDER_LINUX_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PUBLIC_PLATFORM_SENSOR_PROVIDER_LINUX_H_ +#ifndef DEVICE_GENERIC_SENSOR_PUBLIC_PLATFORM_SENSOR_PROVIDER_LINUX_H_ +#define DEVICE_GENERIC_SENSOR_PUBLIC_PLATFORM_SENSOR_PROVIDER_LINUX_H_ -#include "services/device/generic_sensor/platform_sensor_provider.h" +#include "device/generic_sensor/platform_sensor_provider.h" #include "base/single_thread_task_runner.h" -#include "services/device/generic_sensor/linux/sensor_device_manager.h" +#include "device/generic_sensor/generic_sensor_export.h" +#include "device/generic_sensor/linux/sensor_device_manager.h" namespace base { template @@ -20,8 +21,9 @@ namespace device { struct SensorInfoLinux; -class PlatformSensorProviderLinux : public PlatformSensorProvider, - public SensorDeviceManager::Delegate { +class DEVICE_GENERIC_SENSOR_EXPORT PlatformSensorProviderLinux + : public PlatformSensorProvider, + public SensorDeviceManager::Delegate { public: static PlatformSensorProviderLinux* GetInstance(); @@ -117,4 +119,4 @@ class PlatformSensorProviderLinux : public PlatformSensorProvider, } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PUBLIC_PLATFORM_SENSOR_PROVIDER_LINUX_H_ +#endif // DEVICE_GENERIC_SENSOR_PUBLIC_PLATFORM_SENSOR_PROVIDER_LINUX_H_ diff --git a/services/device/generic_sensor/platform_sensor_provider_mac.cc b/device/generic_sensor/platform_sensor_provider_mac.cc similarity index 84% rename from services/device/generic_sensor/platform_sensor_provider_mac.cc rename to device/generic_sensor/platform_sensor_provider_mac.cc index 2fdfb1d48d399d..f88a34d47179e4 100644 --- a/services/device/generic_sensor/platform_sensor_provider_mac.cc +++ b/device/generic_sensor/platform_sensor_provider_mac.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_provider_mac.h" +#include "device/generic_sensor/platform_sensor_provider_mac.h" #include "base/memory/singleton.h" -#include "services/device/generic_sensor/platform_sensor_accelerometer_mac.h" -#include "services/device/generic_sensor/platform_sensor_ambient_light_mac.h" +#include "device/generic_sensor/platform_sensor_accelerometer_mac.h" +#include "device/generic_sensor/platform_sensor_ambient_light_mac.h" namespace device { diff --git a/services/device/generic_sensor/platform_sensor_provider_mac.h b/device/generic_sensor/platform_sensor_provider_mac.h similarity index 70% rename from services/device/generic_sensor/platform_sensor_provider_mac.h rename to device/generic_sensor/platform_sensor_provider_mac.h index 809a4f21609e1c..f904eb2047d306 100644 --- a/services/device/generic_sensor/platform_sensor_provider_mac.h +++ b/device/generic_sensor/platform_sensor_provider_mac.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_MAC_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_MAC_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_MAC_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_MAC_H_ -#include "services/device/generic_sensor/platform_sensor_provider.h" +#include "device/generic_sensor/platform_sensor_provider.h" namespace device { @@ -27,4 +27,4 @@ class PlatformSensorProviderMac : public PlatformSensorProvider { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_MAC_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_MAC_H_ diff --git a/services/device/generic_sensor/platform_sensor_provider_unittest.cc b/device/generic_sensor/platform_sensor_provider_unittest.cc similarity index 98% rename from services/device/generic_sensor/platform_sensor_provider_unittest.cc rename to device/generic_sensor/platform_sensor_provider_unittest.cc index 899e7f3382ee1f..4b20c2eadffc76 100644 --- a/services/device/generic_sensor/platform_sensor_provider_unittest.cc +++ b/device/generic_sensor/platform_sensor_provider_unittest.cc @@ -6,9 +6,9 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" -#include "services/device/generic_sensor/fake_platform_sensor.h" -#include "services/device/generic_sensor/fake_platform_sensor_provider.h" -#include "services/device/public/interfaces/sensor_provider.mojom.h" +#include "device/generic_sensor/fake_platform_sensor.h" +#include "device/generic_sensor/fake_platform_sensor_provider.h" +#include "device/generic_sensor/public/interfaces/sensor_provider.mojom.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/services/device/generic_sensor/platform_sensor_provider_win.cc b/device/generic_sensor/platform_sensor_provider_win.cc similarity index 95% rename from services/device/generic_sensor/platform_sensor_provider_win.cc rename to device/generic_sensor/platform_sensor_provider_win.cc index 07ffe2ebf6a3e6..e8948375a5e4f1 100644 --- a/services/device/generic_sensor/platform_sensor_provider_win.cc +++ b/device/generic_sensor/platform_sensor_provider_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_provider_win.h" +#include "device/generic_sensor/platform_sensor_provider_win.h" #include @@ -10,7 +10,7 @@ #include "base/memory/singleton.h" #include "base/task_runner_util.h" #include "base/threading/thread.h" -#include "services/device/generic_sensor/platform_sensor_win.h" +#include "device/generic_sensor/platform_sensor_win.h" namespace device { diff --git a/services/device/generic_sensor/platform_sensor_provider_win.h b/device/generic_sensor/platform_sensor_provider_win.h similarity index 83% rename from services/device/generic_sensor/platform_sensor_provider_win.h rename to device/generic_sensor/platform_sensor_provider_win.h index f22c79f599c8f9..9cdacb44c225c7 100644 --- a/services/device/generic_sensor/platform_sensor_provider_win.h +++ b/device/generic_sensor/platform_sensor_provider_win.h @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_WIN_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_WIN_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_WIN_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_WIN_H_ #include #include "base/win/scoped_comptr.h" -#include "services/device/generic_sensor/platform_sensor_provider.h" +#include "device/generic_sensor/generic_sensor_export.h" +#include "device/generic_sensor/platform_sensor_provider.h" namespace base { template @@ -25,7 +26,8 @@ class PlatformSensorReaderWin; // - Starts sensor thread and stops it when there are no active sensors. // - Initialises ISensorManager and creates sensor reader on sensor thread. // - Constructs PlatformSensorWin on IPC thread and returns it to requester. -class PlatformSensorProviderWin final : public PlatformSensorProvider { +class DEVICE_GENERIC_SENSOR_EXPORT PlatformSensorProviderWin final + : public PlatformSensorProvider { public: static PlatformSensorProviderWin* GetInstance(); @@ -68,4 +70,4 @@ class PlatformSensorProviderWin final : public PlatformSensorProvider { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_WIN_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_PROVIDER_WIN_H_ diff --git a/services/device/generic_sensor/platform_sensor_reader_linux.cc b/device/generic_sensor/platform_sensor_reader_linux.cc similarity index 90% rename from services/device/generic_sensor/platform_sensor_reader_linux.cc rename to device/generic_sensor/platform_sensor_reader_linux.cc index 521d780a7660fa..a814e878e27def 100644 --- a/services/device/generic_sensor/platform_sensor_reader_linux.cc +++ b/device/generic_sensor/platform_sensor_reader_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_reader_linux.h" +#include "device/generic_sensor/platform_sensor_reader_linux.h" #include "base/files/file_util.h" #include "base/memory/ptr_util.h" @@ -11,9 +11,9 @@ #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h" #include "base/timer/timer.h" -#include "services/device/generic_sensor/linux/sensor_data_linux.h" -#include "services/device/generic_sensor/platform_sensor_linux.h" -#include "services/device/public/cpp/generic_sensor/sensor_reading.h" +#include "device/generic_sensor/linux/sensor_data_linux.h" +#include "device/generic_sensor/platform_sensor_linux.h" +#include "device/generic_sensor/public/cpp/sensor_reading.h" namespace device { @@ -86,11 +86,10 @@ void PollingSensorReader::InitializeTimer( const PlatformSensorConfiguration& configuration) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK(!is_reading_active_); - timer_.Start( - FROM_HERE, - base::TimeDelta::FromMicroseconds(base::Time::kMicrosecondsPerSecond / - configuration.frequency()), - this, &PollingSensorReader::PollForData); + timer_.Start(FROM_HERE, base::TimeDelta::FromMicroseconds( + base::Time::kMicrosecondsPerSecond / + configuration.frequency()), + this, &PollingSensorReader::PollForData); is_reading_active_ = true; } diff --git a/services/device/generic_sensor/platform_sensor_reader_linux.h b/device/generic_sensor/platform_sensor_reader_linux.h similarity index 89% rename from services/device/generic_sensor/platform_sensor_reader_linux.h rename to device/generic_sensor/platform_sensor_reader_linux.h index c944efa848dab5..c5c1630d14f76f 100644 --- a/services/device/generic_sensor/platform_sensor_reader_linux.h +++ b/device/generic_sensor/platform_sensor_reader_linux.h @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_LINUX_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_LINUX_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_LINUX_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_LINUX_H_ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "device/generic_sensor/generic_sensor_export.h" namespace base { class SingleThreadTaskRunner; @@ -69,4 +70,4 @@ class SensorReader { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_LINUX_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_LINUX_H_ diff --git a/services/device/generic_sensor/platform_sensor_reader_win.cc b/device/generic_sensor/platform_sensor_reader_win.cc similarity index 91% rename from services/device/generic_sensor/platform_sensor_reader_win.cc rename to device/generic_sensor/platform_sensor_reader_win.cc index b8a16d39a2672d..d158b99f33c105 100644 --- a/services/device/generic_sensor/platform_sensor_reader_win.cc +++ b/device/generic_sensor/platform_sensor_reader_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_reader_win.h" +#include "device/generic_sensor/platform_sensor_reader_win.h" #include #include @@ -13,9 +13,9 @@ #include "base/time/time.h" #include "base/win/iunknown_impl.h" #include "base/win/scoped_propvariant.h" -#include "services/device/generic_sensor/generic_sensor_consts.h" -#include "services/device/public/cpp/generic_sensor/platform_sensor_configuration.h" -#include "services/device/public/cpp/generic_sensor/sensor_reading.h" +#include "device/generic_sensor/generic_sensor_consts.h" +#include "device/generic_sensor/public/cpp/platform_sensor_configuration.h" +#include "device/generic_sensor/public/cpp/sensor_reading.h" namespace device { @@ -105,31 +105,31 @@ std::unique_ptr CreateAccelerometerReaderInitParams() { std::unique_ptr CreateGyroscopeReaderInitParams() { auto params = base::MakeUnique(); params->sensor_type_id = SENSOR_TYPE_GYROMETER_3D; - params->reader_func = - base::Bind([](ISensorDataReport* report, SensorReading* reading) { - double x = 0.0; - double y = 0.0; - double z = 0.0; - if (!GetReadingValueForProperty( - SENSOR_DATA_TYPE_ANGULAR_VELOCITY_X_DEGREES_PER_SECOND, report, - &x) || - !GetReadingValueForProperty( - SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Y_DEGREES_PER_SECOND, report, - &y) || - !GetReadingValueForProperty( - SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Z_DEGREES_PER_SECOND, report, - &z)) { - return E_FAIL; - } + params->reader_func = base::Bind([](ISensorDataReport* report, + SensorReading* reading) { + double x = 0.0; + double y = 0.0; + double z = 0.0; + if (!GetReadingValueForProperty( + SENSOR_DATA_TYPE_ANGULAR_VELOCITY_X_DEGREES_PER_SECOND, report, + &x) || + !GetReadingValueForProperty( + SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Y_DEGREES_PER_SECOND, report, + &y) || + !GetReadingValueForProperty( + SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Z_DEGREES_PER_SECOND, report, + &z)) { + return E_FAIL; + } - // Windows uses coordinate system where Z axis points down from device - // screen, therefore, using right hand notation, we have to reverse - // sign for each axis. Values are converted from deg to rad. - reading->values[0] = -x * kRadiansInDegrees; - reading->values[1] = -y * kRadiansInDegrees; - reading->values[2] = -z * kRadiansInDegrees; - return S_OK; - }); + // Windows uses coordinate system where Z axis points down from device + // screen, therefore, using right hand notation, we have to reverse + // sign for each axis. Values are converted from deg to rad. + reading->values[0] = -x * kRadiansInDegrees; + reading->values[1] = -y * kRadiansInDegrees; + reading->values[2] = -z * kRadiansInDegrees; + return S_OK; + }); return params; } diff --git a/services/device/generic_sensor/platform_sensor_reader_win.h b/device/generic_sensor/platform_sensor_reader_win.h similarity index 90% rename from services/device/generic_sensor/platform_sensor_reader_win.h rename to device/generic_sensor/platform_sensor_reader_win.h index 632a0c376fd7f4..64fb3c8422ae3a 100644 --- a/services/device/generic_sensor/platform_sensor_reader_win.h +++ b/device/generic_sensor/platform_sensor_reader_win.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_WIN_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_WIN_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_WIN_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_WIN_H_ #include #include "base/win/scoped_comptr.h" -#include "services/device/public/interfaces/sensor.mojom.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom.h" namespace device { @@ -79,4 +79,4 @@ class PlatformSensorReaderWin { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_WIN_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_READER_WIN_H_ diff --git a/services/device/generic_sensor/platform_sensor_win.cc b/device/generic_sensor/platform_sensor_win.cc similarity index 97% rename from services/device/generic_sensor/platform_sensor_win.cc rename to device/generic_sensor/platform_sensor_win.cc index fd521ddd3ef5f0..65cf562eeac03f 100644 --- a/services/device/generic_sensor/platform_sensor_win.cc +++ b/device/generic_sensor/platform_sensor_win.cc @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/platform_sensor_win.h" - +#include "device/generic_sensor/platform_sensor_win.h" #include "base/single_thread_task_runner.h" namespace device { diff --git a/services/device/generic_sensor/platform_sensor_win.h b/device/generic_sensor/platform_sensor_win.h similarity index 86% rename from services/device/generic_sensor/platform_sensor_win.h rename to device/generic_sensor/platform_sensor_win.h index b2bd4c223cfcfe..043fb1c5d92d64 100644 --- a/services/device/generic_sensor/platform_sensor_win.h +++ b/device/generic_sensor/platform_sensor_win.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_WIN_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_WIN_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_WIN_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_WIN_H_ #include "base/memory/weak_ptr.h" -#include "services/device/generic_sensor/platform_sensor.h" -#include "services/device/generic_sensor/platform_sensor_reader_win.h" +#include "device/generic_sensor/platform_sensor.h" +#include "device/generic_sensor/platform_sensor_reader_win.h" namespace base { class SingleThreadTaskRunner; @@ -59,4 +59,4 @@ class PlatformSensorWin final : public PlatformSensor, } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_WIN_H_ +#endif // DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_WIN_H_ diff --git a/services/device/public/cpp/generic_sensor/BUILD.gn b/device/generic_sensor/public/cpp/BUILD.gn similarity index 75% rename from services/device/public/cpp/generic_sensor/BUILD.gn rename to device/generic_sensor/public/cpp/BUILD.gn index 351ea5c9d0de1e..420fffb27a80ad 100644 --- a/services/device/public/cpp/generic_sensor/BUILD.gn +++ b/device/generic_sensor/public/cpp/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -source_set("generic_sensor") { +component("cpp") { sources = [ "platform_sensor_configuration.cc", "platform_sensor_configuration.h", @@ -10,8 +10,10 @@ source_set("generic_sensor") { "sensor_reading.h", ] + defines = [ "DEVICE_GENERIC_SENSOR_PUBLIC_IMPLEMENTATION" ] + public_deps = [ - "//services/device/public/interfaces:generic_sensor", + "//device/generic_sensor/public/interfaces", ] deps = [ diff --git a/services/device/public/cpp/generic_sensor/OWNERS b/device/generic_sensor/public/cpp/OWNERS similarity index 100% rename from services/device/public/cpp/generic_sensor/OWNERS rename to device/generic_sensor/public/cpp/OWNERS diff --git a/device/generic_sensor/public/cpp/generic_sensor_public_export.h b/device/generic_sensor/public/cpp/generic_sensor_public_export.h new file mode 100644 index 00000000000000..fba050035c4c98 --- /dev/null +++ b/device/generic_sensor/public/cpp/generic_sensor_public_export.h @@ -0,0 +1,30 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef DEVICE_GENERIC_SENSOR_PUBLIC_CPP_GENERIC_SENSOR_PUBLIC_EXPORT_H_ +#define DEVICE_GENERIC_SENSOR_PUBLIC_CPP_GENERIC_SENSOR_PUBLIC_EXPORT_H_ + +#if defined(COMPONENT_BUILD) +#if defined(WIN32) + +#if defined(DEVICE_GENERIC_SENSOR_PUBLIC_IMPLEMENTATION) +#define DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT __declspec(dllexport) +#else +#define DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT __declspec(dllimport) +#endif // defined(DEVICE_GENERIC_SENSOR_PUBLIC_IMPLEMENTATION) + +#else // defined(WIN32) +#if defined(DEVICE_GENERIC_SENSOR_PUBLIC_IMPLEMENTATION) +#define DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT \ + __attribute__((visibility("default"))) +#else +#define DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT +#endif +#endif + +#else // defined(COMPONENT_BUILD) +#define DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT +#endif + +#endif // DEVICE_GENERIC_SENSOR_PUBLIC_CPP_GENERIC_SENSOR_PUBLIC_EXPORT_H_ diff --git a/services/device/public/cpp/generic_sensor/platform_sensor_configuration.cc b/device/generic_sensor/public/cpp/platform_sensor_configuration.cc similarity index 87% rename from services/device/public/cpp/generic_sensor/platform_sensor_configuration.cc rename to device/generic_sensor/public/cpp/platform_sensor_configuration.cc index 2079b3029e2185..44b26b32b3902f 100644 --- a/services/device/public/cpp/generic_sensor/platform_sensor_configuration.cc +++ b/device/generic_sensor/public/cpp/platform_sensor_configuration.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/public/cpp/generic_sensor/platform_sensor_configuration.h" +#include "device/generic_sensor/public/cpp/platform_sensor_configuration.h" -#include "services/device/public/interfaces/sensor.mojom.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom.h" namespace device { diff --git a/services/device/public/cpp/generic_sensor/platform_sensor_configuration.h b/device/generic_sensor/public/cpp/platform_sensor_configuration.h similarity index 72% rename from services/device/public/cpp/generic_sensor/platform_sensor_configuration.h rename to device/generic_sensor/public/cpp/platform_sensor_configuration.h index baca2f0350fb4f..e124eaa1e62a19 100644 --- a/services/device/public/cpp/generic_sensor/platform_sensor_configuration.h +++ b/device/generic_sensor/public/cpp/platform_sensor_configuration.h @@ -2,14 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_PLATFORM_SENSOR_CONFIGURATION_H_ -#define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_PLATFORM_SENSOR_CONFIGURATION_H_ +#ifndef DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_CONFIGURATION_H_ +#define DEVICE_GENERIC_SENSOR_PLATFORM_SENSOR_CONFIGURATION_H_ #include "base/logging.h" +#include "device/generic_sensor/public/cpp/generic_sensor_public_export.h" namespace device { -class PlatformSensorConfiguration { +class DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT PlatformSensorConfiguration { public: PlatformSensorConfiguration(); explicit PlatformSensorConfiguration(double frequency); @@ -31,4 +32,4 @@ class PlatformSensorConfiguration { } // namespace device -#endif // SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_PLATFORM_SENSOR_CONFIGURATION_H_ +#endif // DEVICE_SENSORS_PLATFORM_SENSOR_CONFIGURATION_H_ diff --git a/services/device/public/cpp/generic_sensor/sensor_reading.cc b/device/generic_sensor/public/cpp/sensor_reading.cc similarity index 91% rename from services/device/public/cpp/generic_sensor/sensor_reading.cc rename to device/generic_sensor/public/cpp/sensor_reading.cc index 85b2c369c23df7..ae61145f4d6566 100644 --- a/services/device/public/cpp/generic_sensor/sensor_reading.cc +++ b/device/generic_sensor/public/cpp/sensor_reading.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/public/cpp/generic_sensor/sensor_reading.h" +#include "device/generic_sensor/public/cpp/sensor_reading.h" namespace device { diff --git a/services/device/public/cpp/generic_sensor/sensor_reading.h b/device/generic_sensor/public/cpp/sensor_reading.h similarity index 89% rename from services/device/public/cpp/generic_sensor/sensor_reading.h rename to device/generic_sensor/public/cpp/sensor_reading.h index 699f92da319068..a7048f7a9a348a 100644 --- a/services/device/public/cpp/generic_sensor/sensor_reading.h +++ b/device/generic_sensor/public/cpp/sensor_reading.h @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_ -#define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_ +#ifndef DEVICE_GENERIC_SENSOR_PUBLIC_CPP_SENSOR_READING_H_ +#define DEVICE_GENERIC_SENSOR_PUBLIC_CPP_SENSOR_READING_H_ #include "device/base/synchronization/one_writer_seqlock.h" -#include "services/device/public/interfaces/sensor.mojom.h" +#include "device/generic_sensor/public/cpp/generic_sensor_public_export.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom.h" namespace device { @@ -39,7 +40,7 @@ class SensorReadingField { }; // This structure represents sensor reading data: timestamp and 4 values. -struct SensorReading { +struct DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT SensorReading { SensorReading(); ~SensorReading(); SensorReading(const SensorReading& other); @@ -100,7 +101,7 @@ struct SensorReading { // This structure represents sensor reading buffer: sensor reading and seqlock // for synchronization. -struct SensorReadingSharedBuffer { +struct DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT SensorReadingSharedBuffer { SensorReadingSharedBuffer(); ~SensorReadingSharedBuffer(); SensorReadingField seqlock; @@ -112,4 +113,4 @@ struct SensorReadingSharedBuffer { } // namespace device -#endif // SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_ +#endif // DEVICE_GENERIC_SENSOR_PUBLIC_CPP_SENSOR_READING_H_ diff --git a/services/device/public/cpp/generic_sensor/sensor_struct_traits.cc b/device/generic_sensor/public/cpp/sensor_struct_traits.cc similarity index 90% rename from services/device/public/cpp/generic_sensor/sensor_struct_traits.cc rename to device/generic_sensor/public/cpp/sensor_struct_traits.cc index 89c49e95964ead..2a36547a38cae0 100644 --- a/services/device/public/cpp/generic_sensor/sensor_struct_traits.cc +++ b/device/generic_sensor/public/cpp/sensor_struct_traits.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/public/cpp/generic_sensor/sensor_struct_traits.h" +#include "device/generic_sensor/public/cpp/sensor_struct_traits.h" namespace mojo { diff --git a/services/device/public/cpp/generic_sensor/sensor_struct_traits.h b/device/generic_sensor/public/cpp/sensor_struct_traits.h similarity index 61% rename from services/device/public/cpp/generic_sensor/sensor_struct_traits.h rename to device/generic_sensor/public/cpp/sensor_struct_traits.h index e15f8ee03be7db..0514c1e2bab176 100644 --- a/services/device/public/cpp/generic_sensor/sensor_struct_traits.h +++ b/device/generic_sensor/public/cpp/sensor_struct_traits.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_STRUCT_TRAITS_H_ -#define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_STRUCT_TRAITS_H_ +#ifndef DEVICE_GENERIC_SENSOR_PUBLIC_INTERFACES_SENSOR_STRUCT_TRAITS_H_ +#define DEVICE_GENERIC_SENSOR_PUBLIC_INTERFACES_SENSOR_STRUCT_TRAITS_H_ -#include "services/device/public/cpp/generic_sensor/platform_sensor_configuration.h" -#include "services/device/public/interfaces/sensor.mojom.h" +#include "device/generic_sensor/public/cpp/platform_sensor_configuration.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom.h" namespace mojo { @@ -23,4 +23,4 @@ struct StructTraits diff --git a/services/device/generic_sensor/sensor_impl.h b/device/generic_sensor/sensor_impl.h similarity index 82% rename from services/device/generic_sensor/sensor_impl.h rename to device/generic_sensor/sensor_impl.h index fc0207cb92cf0a..3730fc688706ea 100644 --- a/services/device/generic_sensor/sensor_impl.h +++ b/device/generic_sensor/sensor_impl.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_SENSOR_IMPL_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_SENSOR_IMPL_H_ +#ifndef DEVICE_GENERIC_SENSOR_SENSOR_IMPL_H_ +#define DEVICE_GENERIC_SENSOR_SENSOR_IMPL_H_ #include "base/macros.h" -#include "services/device/generic_sensor/platform_sensor.h" -#include "services/device/public/interfaces/sensor.mojom.h" +#include "device/generic_sensor/platform_sensor.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom.h" namespace device { @@ -47,4 +47,4 @@ class SensorImpl final : public mojom::Sensor, public PlatformSensor::Client { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_SENSOR_IMPL_H_ +#endif // DEVICE_GENERIC_SENSOR_SENSOR_IMPL_H_ diff --git a/services/device/generic_sensor/sensor_provider_impl.cc b/device/generic_sensor/sensor_provider_impl.cc similarity index 95% rename from services/device/generic_sensor/sensor_provider_impl.cc rename to device/generic_sensor/sensor_provider_impl.cc index e08945aa33701b..8f36c47f0de324 100644 --- a/services/device/generic_sensor/sensor_provider_impl.cc +++ b/device/generic_sensor/sensor_provider_impl.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "services/device/generic_sensor/sensor_provider_impl.h" +#include "device/generic_sensor/sensor_provider_impl.h" #include #include "base/memory/ptr_util.h" #include "base/threading/thread_task_runner_handle.h" +#include "device/generic_sensor/platform_sensor_provider.h" +#include "device/generic_sensor/sensor_impl.h" #include "mojo/public/cpp/bindings/strong_binding.h" -#include "services/device/generic_sensor/platform_sensor_provider.h" -#include "services/device/generic_sensor/sensor_impl.h" namespace device { diff --git a/services/device/generic_sensor/sensor_provider_impl.h b/device/generic_sensor/sensor_provider_impl.h similarity index 78% rename from services/device/generic_sensor/sensor_provider_impl.h rename to device/generic_sensor/sensor_provider_impl.h index d99f0eafd2d26a..3435f12351c82b 100644 --- a/services/device/generic_sensor/sensor_provider_impl.h +++ b/device/generic_sensor/sensor_provider_impl.h @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_DEVICE_GENERIC_SENSOR_SENSOR_PROVIDER_IMPL_H_ -#define SERVICES_DEVICE_GENERIC_SENSOR_SENSOR_PROVIDER_IMPL_H_ +#ifndef DEVICE_GENERIC_SENSOR_SENSOR_PROVIDER_IMPL_H_ +#define DEVICE_GENERIC_SENSOR_SENSOR_PROVIDER_IMPL_H_ #include "base/macros.h" #include "base/single_thread_task_runner.h" -#include "services/device/public/interfaces/sensor_provider.mojom.h" +#include "device/generic_sensor/generic_sensor_export.h" +#include "device/generic_sensor/public/interfaces/sensor_provider.mojom.h" namespace device { @@ -17,7 +18,8 @@ class PlatformSensor; // Implementation of SensorProvider mojo interface. // Uses PlatformSensorProvider singleton to create platform specific instances // of PlatformSensor which are used by SensorImpl. -class SensorProviderImpl final : public mojom::SensorProvider { +class DEVICE_GENERIC_SENSOR_EXPORT SensorProviderImpl final + : public mojom::SensorProvider { public: static void Create( scoped_refptr file_task_runner, @@ -48,4 +50,4 @@ class SensorProviderImpl final : public mojom::SensorProvider { } // namespace device -#endif // SERVICES_DEVICE_GENERIC_SENSOR_SENSOR_PROVIDER_IMPL_H_ +#endif // DEVICE_GENERIC_SENSOR_SENSOR_PROVIDER_IMPL_H_ diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni index 2e5f5ac01c55df..6fe0750fec2041 100644 --- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni +++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni @@ -19,6 +19,7 @@ _typemap_imports = [ "//content/public/common/typemaps.gni", "//device/bluetooth/public/interfaces/typemaps.gni", "//device/gamepad/public/interfaces/typemaps.gni", + "//device/generic_sensor/public/interfaces/typemaps.gni", "//device/usb/public/interfaces/typemaps.gni", "//extensions/common/typemaps.gni", "//gpu/ipc/common/typemaps.gni", @@ -27,7 +28,6 @@ _typemap_imports = [ "//mojo/common/typemaps.gni", "//mojo/public/cpp/bindings/tests/chromium_typemaps.gni", "//net/interfaces/typemaps.gni", - "//services/device/public/interfaces/typemaps.gni", "//services/preferences/public/cpp/typemaps.gni", "//services/resource_coordinator/public/cpp/typemaps.gni", "//services/service_manager/public/cpp/typemaps.gni", diff --git a/services/BUILD.gn b/services/BUILD.gn index 342fafd3ac5527..3c46a9409ef860 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -71,10 +71,10 @@ if (is_android) { "$google_play_services_package:google_play_services_vision_java", "//base:base_java", "//base:base_java_test_support", + "//device/generic_sensor:java", + "//device/generic_sensor/public/interfaces:interfaces_java", "//mojo/public/java:bindings_java", "//mojo/public/java:system_java", - "//services/device/generic_sensor:java", - "//services/device/public/interfaces:generic_sensor_java", "//services/shape_detection:shape_detection_java", "//third_party/android_tools:android_support_annotations_java", ] diff --git a/services/device/BUILD.gn b/services/device/BUILD.gn index 97259a916c9eaa..8d5d4ee76caf44 100644 --- a/services/device/BUILD.gn +++ b/services/device/BUILD.gn @@ -25,12 +25,12 @@ source_set("lib") { deps = [ "//base", + "//device/generic_sensor", "//device/nfc:mojo_bindings", "//device/sensors", "//device/sensors/public/interfaces", "//device/wake_lock", "//services/device/fingerprint", - "//services/device/generic_sensor", "//services/device/power_monitor", "//services/device/public/cpp:device_features", "//services/device/public/interfaces", @@ -54,16 +54,12 @@ source_set("lib") { } } -is_linux_without_udev = is_linux && !use_udev - source_set("tests") { testonly = true sources = [ "battery/battery_status_manager_win_unittest.cc", "battery/battery_status_service_unittest.cc", - "generic_sensor/platform_sensor_and_provider_unittest_win.cc", - "generic_sensor/platform_sensor_provider_unittest.cc", "power_monitor/power_monitor_message_broadcaster_unittest.cc", "public/cpp/power_monitor/power_monitor_broadcast_source_unittest.cc", "vibration/vibration_manager_impl_unittest.cc", @@ -74,19 +70,12 @@ source_set("tests") { "//base", "//base/test:test_support", "//mojo/public/cpp/bindings", - "//services/device/generic_sensor", - "//services/device/generic_sensor:testing", "//services/device/power_monitor", "//services/device/public/cpp/power_monitor", "//testing/gmock", "//testing/gtest", ] - if (!is_linux_without_udev) { - sources += - [ "generic_sensor/platform_sensor_and_provider_unittest_linux.cc" ] - } - if (is_linux && !is_chromeos && use_dbus) { sources += [ "battery/battery_status_manager_linux_unittest.cc" ] deps += [ "//dbus:test_support" ] @@ -115,14 +104,6 @@ source_set("tests") { "//services/device/vibration", ] } - - if (is_win) { - # Needed for "generic_sensor/platform_sensor_and_provider_unittest_win.cc" - libs = [ - "propsys.lib", - "sensorsapi.lib", - ] - } } service_manifest("manifest") { @@ -190,7 +171,6 @@ if (is_android) { "//mojo/public/java:bindings_java", "//mojo/public/java:system_java", "//services/device/battery/android:battery_monitor_java", - "//services/device/generic_sensor:java", "//services/device/public/interfaces:interfaces_java", "//services/device/screen_orientation:java", "//services/device/time_zone_monitor:java", diff --git a/services/device/android/register_jni.cc b/services/device/android/register_jni.cc index 041dfdf340d9a3..345a8699e79c2e 100644 --- a/services/device/android/register_jni.cc +++ b/services/device/android/register_jni.cc @@ -5,7 +5,6 @@ #include "services/device/android/register_jni.h" #include "base/android/jni_android.h" -#include "services/device/generic_sensor/android/sensors_jni_registrar.h" #include "services/device/time_zone_monitor/android/time_zone_monitor_jni_registrar.h" namespace device { @@ -16,9 +15,6 @@ bool EnsureJniRegistered() { if (!g_jni_init_done) { JNIEnv* env = base::android::AttachCurrentThread(); - if (!android::RegisterSensorsJni(env)) - return false; - if (!android::RegisterTimeZoneMonitorJni(env)) return false; diff --git a/services/device/device_service.cc b/services/device/device_service.cc index aaa5317db6d67b..f43c3ca2eac670 100644 --- a/services/device/device_service.cc +++ b/services/device/device_service.cc @@ -12,11 +12,11 @@ #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "device/generic_sensor/sensor_provider_impl.h" #include "device/sensors/device_sensor_host.h" #include "device/wake_lock/wake_lock_provider.h" #include "mojo/public/cpp/system/message_pipe.h" #include "services/device/fingerprint/fingerprint.h" -#include "services/device/generic_sensor/sensor_provider_impl.h" #include "services/device/power_monitor/power_monitor_message_broadcaster.h" #include "services/device/public/cpp/device_features.h" #include "services/device/public/interfaces/battery_monitor.mojom.h" diff --git a/services/device/device_service.h b/services/device/device_service.h index 4048ccfc50dfaf..127fa9058e3eb7 100644 --- a/services/device/device_service.h +++ b/services/device/device_service.h @@ -6,6 +6,7 @@ #define SERVICES_DEVICE_DEVICE_SERVICE_H_ #include "base/memory/ref_counted.h" +#include "device/generic_sensor/public/interfaces/sensor_provider.mojom.h" #include "device/nfc/nfc_provider.mojom.h" #include "device/screen_orientation/public/interfaces/screen_orientation.mojom.h" #include "device/sensors/public/interfaces/motion.mojom.h" @@ -16,7 +17,6 @@ #include "services/device/public/interfaces/battery_monitor.mojom.h" #include "services/device/public/interfaces/fingerprint.mojom.h" #include "services/device/public/interfaces/power_monitor.mojom.h" -#include "services/device/public/interfaces/sensor_provider.mojom.h" #include "services/device/public/interfaces/time_zone_monitor.mojom.h" #include "services/device/public/interfaces/vibration_manager.mojom.h" #include "services/service_manager/public/cpp/binder_registry.h" diff --git a/services/device/public/interfaces/BUILD.gn b/services/device/public/interfaces/BUILD.gn index e4f3123e4cff4e..ea9dd259754799 100644 --- a/services/device/public/interfaces/BUILD.gn +++ b/services/device/public/interfaces/BUILD.gn @@ -22,20 +22,6 @@ mojom("interfaces") { use_once_callback = false } -mojom("generic_sensor") { - sources = [ - "sensor.mojom", - "sensor_provider.mojom", - ] - - public_deps = [ - ":constants", - ] - - # TODO(crbug.com/714018): Convert the implementation to use OnceCallback. - use_once_callback = false -} - mojom("constants") { sources = [ "constants.mojom", diff --git a/services/device/public/interfaces/OWNERS b/services/device/public/interfaces/OWNERS index 2c44a463856dd1..08850f421205f8 100644 --- a/services/device/public/interfaces/OWNERS +++ b/services/device/public/interfaces/OWNERS @@ -1,6 +1,2 @@ per-file *.mojom=set noparent per-file *.mojom=file://ipc/SECURITY_OWNERS -per-file *_struct_traits*.*=set noparent -per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS -per-file *.typemap=set noparent -per-file *.typemap=file://ipc/SECURITY_OWNERS diff --git a/services/device/public/interfaces/sensor.typemap b/services/device/public/interfaces/sensor.typemap deleted file mode 100644 index d230c996486694..00000000000000 --- a/services/device/public/interfaces/sensor.typemap +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -mojom = "//services/device/public/interfaces/sensor.mojom" -public_headers = [ "//services/device/public/cpp/generic_sensor/platform_sensor_configuration.h" ] -traits_headers = - [ "//services/device/public/cpp/generic_sensor/sensor_struct_traits.h" ] -sources = [ - "//services/device/public/cpp/generic_sensor/sensor_struct_traits.cc", -] -type_mappings = - [ "device.mojom.SensorConfiguration=device::PlatformSensorConfiguration" ] diff --git a/third_party/WebKit/LayoutTests/sensor/resources/sensor-helpers.js b/third_party/WebKit/LayoutTests/sensor/resources/sensor-helpers.js index 0aca665d5610f0..98648a0bc44d81 100644 --- a/third_party/WebKit/LayoutTests/sensor/resources/sensor-helpers.js +++ b/third_party/WebKit/LayoutTests/sensor/resources/sensor-helpers.js @@ -21,8 +21,8 @@ function sensor_mocks(mojo) { return define('Generic Sensor API mocks', [ 'mojo/public/js/core', 'mojo/public/js/bindings', - 'services/device/public/interfaces/sensor_provider.mojom', - 'services/device/public/interfaces/sensor.mojom', + 'device/generic_sensor/public/interfaces/sensor_provider.mojom', + 'device/generic_sensor/public/interfaces/sensor.mojom', 'services/device/public/interfaces/constants.mojom', ], (core, bindings, sensor_provider, sensor, deviceConstants) => { diff --git a/third_party/WebKit/Source/bindings/modules/BUILD.gn b/third_party/WebKit/Source/bindings/modules/BUILD.gn index 3e176facb274df..ca6e9c18c1c4a0 100644 --- a/third_party/WebKit/Source/bindings/modules/BUILD.gn +++ b/third_party/WebKit/Source/bindings/modules/BUILD.gn @@ -73,9 +73,9 @@ make_event_factory("event_modules") { ] deps = make_core_generated_deps + [ "//third_party/WebKit/Source/bindings/modules:modules_bindings_generated_event_interfaces" ] deps += [ + "//device/generic_sensor/public/interfaces:interfaces_blink", "//device/vr:mojo_bindings_blink", "//media/midi:mojo_blink", - "//services/device/public/interfaces:generic_sensor_blink", ] } diff --git a/third_party/WebKit/Source/modules/sensor/BUILD.gn b/third_party/WebKit/Source/modules/sensor/BUILD.gn index 0bc0cd6a43db68..7fd28fa6f228d1 100644 --- a/third_party/WebKit/Source/modules/sensor/BUILD.gn +++ b/third_party/WebKit/Source/modules/sensor/BUILD.gn @@ -30,9 +30,9 @@ blink_modules_sources("sensor") { deps = [ "//device/base/synchronization", - "//services/device/public/cpp/generic_sensor", + "//device/generic_sensor/public/cpp", + "//device/generic_sensor/public/interfaces:interfaces_blink", "//services/device/public/interfaces:constants_blink", - "//services/device/public/interfaces:generic_sensor_blink", "//services/service_manager/public/cpp", ] } diff --git a/third_party/WebKit/Source/modules/sensor/DEPS b/third_party/WebKit/Source/modules/sensor/DEPS index 6cffc204fd2473..1ba448a56bc899 100644 --- a/third_party/WebKit/Source/modules/sensor/DEPS +++ b/third_party/WebKit/Source/modules/sensor/DEPS @@ -1,12 +1,11 @@ include_rules = [ + "+device/generic_sensor/public/cpp", + "+device/generic_sensor/public/interfaces", "-modules", "+modules/EventModules.h", "+modules/EventTargetModules.h", "+modules/ModulesExport.h", "+modules/sensor", "+mojo/public/cpp/bindings", - "+services/device/public/cpp/generic_sensor", - "+services/device/public/interfaces/sensor.mojom-blink.h", - "+services/device/public/interfaces/sensor_provider.mojom-blink.h", "+services/device/public/interfaces/constants.mojom-blink.h", ] diff --git a/third_party/WebKit/Source/modules/sensor/Sensor.cpp b/third_party/WebKit/Source/modules/sensor/Sensor.cpp index d197fd4b2cceff..0c87fb79916d8c 100644 --- a/third_party/WebKit/Source/modules/sensor/Sensor.cpp +++ b/third_party/WebKit/Source/modules/sensor/Sensor.cpp @@ -10,9 +10,9 @@ #include "core/inspector/ConsoleMessage.h" #include "core/timing/DOMWindowPerformance.h" #include "core/timing/Performance.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom-blink.h" #include "modules/sensor/SensorErrorEvent.h" #include "modules/sensor/SensorProviderProxy.h" -#include "services/device/public/interfaces/sensor.mojom-blink.h" using namespace device::mojom::blink; diff --git a/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.h b/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.h index cd24d7684a0762..853b934adff7bc 100644 --- a/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.h +++ b/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.h @@ -6,10 +6,10 @@ #define SensorProviderProxy_h #include "core/frame/LocalFrame.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom-blink.h" +#include "device/generic_sensor/public/interfaces/sensor_provider.mojom-blink.h" #include "platform/Supplementable.h" #include "platform/heap/Handle.h" -#include "services/device/public/interfaces/sensor.mojom-blink.h" -#include "services/device/public/interfaces/sensor_provider.mojom-blink.h" namespace blink { diff --git a/third_party/WebKit/Source/modules/sensor/SensorProxy.h b/third_party/WebKit/Source/modules/sensor/SensorProxy.h index 006c3e8cdd61c7..4e77949336eec2 100644 --- a/third_party/WebKit/Source/modules/sensor/SensorProxy.h +++ b/third_party/WebKit/Source/modules/sensor/SensorProxy.h @@ -7,14 +7,14 @@ #include "core/dom/ExceptionCode.h" #include "core/page/PageVisibilityObserver.h" +#include "device/generic_sensor/public/cpp/sensor_reading.h" +#include "device/generic_sensor/public/interfaces/sensor.mojom-blink.h" +#include "device/generic_sensor/public/interfaces/sensor_provider.mojom-blink.h" #include "mojo/public/cpp/bindings/binding.h" #include "platform/Supplementable.h" #include "platform/Timer.h" #include "platform/heap/Handle.h" #include "platform/wtf/Vector.h" -#include "services/device/public/cpp/generic_sensor/sensor_reading.h" -#include "services/device/public/interfaces/sensor.mojom-blink.h" -#include "services/device/public/interfaces/sensor_provider.mojom-blink.h" namespace blink {