Chromium Code Reviews| Index: services/device/device_service.cc |
| diff --git a/services/device/device_service.cc b/services/device/device_service.cc |
| index ca19aa5cdaf91510201dc5f1bea6a0203241c752..f2a82c68abfae91dcd52688c4ce5ce66a283fcf7 100644 |
| --- a/services/device/device_service.cc |
| +++ b/services/device/device_service.cc |
| @@ -7,7 +7,6 @@ |
| #include <utility> |
| #include "base/bind.h" |
| -#include "base/feature_list.h" |
| #include "base/memory/ptr_util.h" |
| #include "base/memory/weak_ptr.h" |
| #include "base/single_thread_task_runner.h" |
| @@ -18,7 +17,6 @@ |
| #include "mojo/public/cpp/system/message_pipe.h" |
| #include "services/device/fingerprint/fingerprint.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" |
| #include "services/device/time_zone_monitor/time_zone_monitor.h" |
| #include "services/service_manager/public/cpp/bind_source_info.h" |
| @@ -90,8 +88,6 @@ DeviceService::~DeviceService() { |
| void DeviceService::OnStart() { |
| registry_.AddInterface<mojom::Fingerprint>(base::Bind( |
| &DeviceService::BindFingerprintRequest, base::Unretained(this))); |
| - registry_.AddInterface<mojom::MotionSensor>(base::Bind( |
| - &DeviceService::BindMotionSensorRequest, base::Unretained(this))); |
| registry_.AddInterface<mojom::OrientationSensor>(base::Bind( |
| &DeviceService::BindOrientationSensorRequest, base::Unretained(this))); |
| registry_.AddInterface<mojom::OrientationAbsoluteSensor>( |
| @@ -102,10 +98,8 @@ void DeviceService::OnStart() { |
| registry_.AddInterface<mojom::ScreenOrientationListener>( |
| base::Bind(&DeviceService::BindScreenOrientationListenerRequest, |
| base::Unretained(this))); |
| - if (base::FeatureList::IsEnabled(features::kGenericSensor)) { |
| - registry_.AddInterface<mojom::SensorProvider>(base::Bind( |
| - &DeviceService::BindSensorProviderRequest, base::Unretained(this))); |
| - } |
| + registry_.AddInterface<mojom::SensorProvider>(base::Bind( |
| + &DeviceService::BindSensorProviderRequest, base::Unretained(this))); |
| registry_.AddInterface<mojom::TimeZoneMonitor>(base::Bind( |
| &DeviceService::BindTimeZoneMonitorRequest, base::Unretained(this))); |
| registry_.AddInterface<mojom::WakeLockProvider>(base::Bind( |
| @@ -164,23 +158,6 @@ void DeviceService::BindFingerprintRequest( |
| Fingerprint::Create(std::move(request)); |
| } |
| -void DeviceService::BindMotionSensorRequest( |
|
timvolodine
2017/06/07 20:37:36
Does this mean we'll run everything on UI thread?
juncai
2017/06/07 23:05:08
Since now the device motion depends only on //devi
|
| - const service_manager::BindSourceInfo& source_info, |
| - mojom::MotionSensorRequest request) { |
| -#if defined(OS_ANDROID) |
| - // On Android the device sensors implementations need to run on the UI thread |
| - // to communicate to Java. |
| - DeviceMotionHost::Create(std::move(request)); |
| -#else |
| - // On platforms other than Android the device sensors implementations run on |
| - // the IO thread. |
| - if (io_task_runner_) { |
| - io_task_runner_->PostTask(FROM_HERE, base::Bind(&DeviceMotionHost::Create, |
| - base::Passed(&request))); |
| - } |
| -#endif // defined(OS_ANDROID) |
| -} |
| - |
| void DeviceService::BindOrientationSensorRequest( |
| const service_manager::BindSourceInfo& source_info, |
| mojom::OrientationSensorRequest request) { |