Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1418)

Side by Side Diff: services/device/device_service.cc

Issue 2896583005: Reland: Refactor DeviceMotionEventPump to use //device/generic_sensor instead of //device/sensors (Closed)
Patch Set: address more comments Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "services/device/device_service.h" 5 #include "services/device/device_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/feature_list.h"
11 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
12 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
13 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
14 #include "base/threading/thread_task_runner_handle.h" 13 #include "base/threading/thread_task_runner_handle.h"
15 #include "device/generic_sensor/sensor_provider_impl.h" 14 #include "device/generic_sensor/sensor_provider_impl.h"
16 #include "device/sensors/device_sensor_host.h" 15 #include "device/sensors/device_sensor_host.h"
17 #include "device/wake_lock/wake_lock_provider.h" 16 #include "device/wake_lock/wake_lock_provider.h"
18 #include "mojo/public/cpp/system/message_pipe.h" 17 #include "mojo/public/cpp/system/message_pipe.h"
19 #include "services/device/fingerprint/fingerprint.h" 18 #include "services/device/fingerprint/fingerprint.h"
20 #include "services/device/power_monitor/power_monitor_message_broadcaster.h" 19 #include "services/device/power_monitor/power_monitor_message_broadcaster.h"
21 #include "services/device/public/cpp/device_features.h"
22 #include "services/device/public/interfaces/battery_monitor.mojom.h" 20 #include "services/device/public/interfaces/battery_monitor.mojom.h"
23 #include "services/device/time_zone_monitor/time_zone_monitor.h" 21 #include "services/device/time_zone_monitor/time_zone_monitor.h"
24 #include "services/service_manager/public/cpp/bind_source_info.h" 22 #include "services/service_manager/public/cpp/bind_source_info.h"
25 #include "ui/gfx/native_widget_types.h" 23 #include "ui/gfx/native_widget_types.h"
26 24
27 #if defined(OS_ANDROID) 25 #if defined(OS_ANDROID)
28 #include "base/android/jni_android.h" 26 #include "base/android/jni_android.h"
29 #include "jni/InterfaceRegistrar_jni.h" 27 #include "jni/InterfaceRegistrar_jni.h"
30 #include "services/device/android/register_jni.h" 28 #include "services/device/android/register_jni.h"
31 #include "services/device/screen_orientation/screen_orientation_listener_android .h" 29 #include "services/device/screen_orientation/screen_orientation_listener_android .h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 81
84 DeviceService::~DeviceService() { 82 DeviceService::~DeviceService() {
85 #if !defined(OS_ANDROID) 83 #if !defined(OS_ANDROID)
86 device::BatteryStatusService::GetInstance()->Shutdown(); 84 device::BatteryStatusService::GetInstance()->Shutdown();
87 #endif 85 #endif
88 } 86 }
89 87
90 void DeviceService::OnStart() { 88 void DeviceService::OnStart() {
91 registry_.AddInterface<mojom::Fingerprint>(base::Bind( 89 registry_.AddInterface<mojom::Fingerprint>(base::Bind(
92 &DeviceService::BindFingerprintRequest, base::Unretained(this))); 90 &DeviceService::BindFingerprintRequest, base::Unretained(this)));
93 registry_.AddInterface<mojom::MotionSensor>(base::Bind(
94 &DeviceService::BindMotionSensorRequest, base::Unretained(this)));
95 registry_.AddInterface<mojom::OrientationSensor>(base::Bind( 91 registry_.AddInterface<mojom::OrientationSensor>(base::Bind(
96 &DeviceService::BindOrientationSensorRequest, base::Unretained(this))); 92 &DeviceService::BindOrientationSensorRequest, base::Unretained(this)));
97 registry_.AddInterface<mojom::OrientationAbsoluteSensor>( 93 registry_.AddInterface<mojom::OrientationAbsoluteSensor>(
98 base::Bind(&DeviceService::BindOrientationAbsoluteSensorRequest, 94 base::Bind(&DeviceService::BindOrientationAbsoluteSensorRequest,
99 base::Unretained(this))); 95 base::Unretained(this)));
100 registry_.AddInterface<mojom::PowerMonitor>(base::Bind( 96 registry_.AddInterface<mojom::PowerMonitor>(base::Bind(
101 &DeviceService::BindPowerMonitorRequest, base::Unretained(this))); 97 &DeviceService::BindPowerMonitorRequest, base::Unretained(this)));
102 registry_.AddInterface<mojom::ScreenOrientationListener>( 98 registry_.AddInterface<mojom::ScreenOrientationListener>(
103 base::Bind(&DeviceService::BindScreenOrientationListenerRequest, 99 base::Bind(&DeviceService::BindScreenOrientationListenerRequest,
104 base::Unretained(this))); 100 base::Unretained(this)));
105 if (base::FeatureList::IsEnabled(features::kGenericSensor)) { 101 registry_.AddInterface<mojom::SensorProvider>(base::Bind(
106 registry_.AddInterface<mojom::SensorProvider>(base::Bind( 102 &DeviceService::BindSensorProviderRequest, base::Unretained(this)));
107 &DeviceService::BindSensorProviderRequest, base::Unretained(this)));
108 }
109 registry_.AddInterface<mojom::TimeZoneMonitor>(base::Bind( 103 registry_.AddInterface<mojom::TimeZoneMonitor>(base::Bind(
110 &DeviceService::BindTimeZoneMonitorRequest, base::Unretained(this))); 104 &DeviceService::BindTimeZoneMonitorRequest, base::Unretained(this)));
111 registry_.AddInterface<mojom::WakeLockProvider>(base::Bind( 105 registry_.AddInterface<mojom::WakeLockProvider>(base::Bind(
112 &DeviceService::BindWakeLockProviderRequest, base::Unretained(this))); 106 &DeviceService::BindWakeLockProviderRequest, base::Unretained(this)));
113 107
114 #if defined(OS_ANDROID) 108 #if defined(OS_ANDROID)
115 registry_.AddInterface(GetJavaInterfaceProvider() 109 registry_.AddInterface(GetJavaInterfaceProvider()
116 ->CreateInterfaceFactory<mojom::BatteryMonitor>()); 110 ->CreateInterfaceFactory<mojom::BatteryMonitor>());
117 registry_.AddInterface( 111 registry_.AddInterface(
118 GetJavaInterfaceProvider()->CreateInterfaceFactory<mojom::NFCProvider>()); 112 GetJavaInterfaceProvider()->CreateInterfaceFactory<mojom::NFCProvider>());
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 VibrationManagerImpl::Create(std::move(request)); 151 VibrationManagerImpl::Create(std::move(request));
158 } 152 }
159 #endif 153 #endif
160 154
161 void DeviceService::BindFingerprintRequest( 155 void DeviceService::BindFingerprintRequest(
162 const service_manager::BindSourceInfo& source_info, 156 const service_manager::BindSourceInfo& source_info,
163 mojom::FingerprintRequest request) { 157 mojom::FingerprintRequest request) {
164 Fingerprint::Create(std::move(request)); 158 Fingerprint::Create(std::move(request));
165 } 159 }
166 160
167 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
168 const service_manager::BindSourceInfo& source_info,
169 mojom::MotionSensorRequest request) {
170 #if defined(OS_ANDROID)
171 // On Android the device sensors implementations need to run on the UI thread
172 // to communicate to Java.
173 DeviceMotionHost::Create(std::move(request));
174 #else
175 // On platforms other than Android the device sensors implementations run on
176 // the IO thread.
177 if (io_task_runner_) {
178 io_task_runner_->PostTask(FROM_HERE, base::Bind(&DeviceMotionHost::Create,
179 base::Passed(&request)));
180 }
181 #endif // defined(OS_ANDROID)
182 }
183
184 void DeviceService::BindOrientationSensorRequest( 161 void DeviceService::BindOrientationSensorRequest(
185 const service_manager::BindSourceInfo& source_info, 162 const service_manager::BindSourceInfo& source_info,
186 mojom::OrientationSensorRequest request) { 163 mojom::OrientationSensorRequest request) {
187 #if defined(OS_ANDROID) 164 #if defined(OS_ANDROID)
188 // On Android the device sensors implementations need to run on the UI thread 165 // On Android the device sensors implementations need to run on the UI thread
189 // to communicate to Java. 166 // to communicate to Java.
190 DeviceOrientationHost::Create(std::move(request)); 167 DeviceOrientationHost::Create(std::move(request));
191 #else 168 #else
192 // On platforms other than Android the device sensors implementations run on 169 // On platforms other than Android the device sensors implementations run on
193 // the IO thread. 170 // the IO thread.
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 java_interface_provider_.Bind(std::move(provider)); 252 java_interface_provider_.Bind(std::move(provider));
276 253
277 java_interface_provider_initialized_ = true; 254 java_interface_provider_initialized_ = true;
278 } 255 }
279 256
280 return &java_interface_provider_; 257 return &java_interface_provider_;
281 } 258 }
282 #endif 259 #endif
283 260
284 } // namespace device 261 } // namespace device
OLDNEW
« device/generic_sensor/sensor_provider_impl.cc ('K') | « services/device/device_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698