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

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

Issue 2894373002: [DeviceService] Move //device/nfc to be part of the internal impl of Device Service (Closed)
Patch Set: Modify code comment Created 3 years, 7 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
« no previous file with comments | « services/device/device_service.h ('k') | services/device/nfc/OWNERS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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" 10 #include "base/feature_list.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/threading/thread_task_runner_handle.h" 14 #include "base/threading/thread_task_runner_handle.h"
15 #include "device/generic_sensor/sensor_provider_impl.h" 15 #include "device/generic_sensor/sensor_provider_impl.h"
16 #include "device/sensors/device_sensor_host.h" 16 #include "device/sensors/device_sensor_host.h"
17 #include "device/wake_lock/wake_lock_provider.h" 17 #include "device/wake_lock/wake_lock_provider.h"
18 #include "mojo/public/cpp/system/message_pipe.h" 18 #include "mojo/public/cpp/system/message_pipe.h"
19 #include "services/device/fingerprint/fingerprint.h" 19 #include "services/device/fingerprint/fingerprint.h"
20 #include "services/device/power_monitor/power_monitor_message_broadcaster.h" 20 #include "services/device/power_monitor/power_monitor_message_broadcaster.h"
21 #include "services/device/public/cpp/device_features.h" 21 #include "services/device/public/cpp/device_features.h"
22 #include "services/device/public/interfaces/battery_monitor.mojom.h" 22 #include "services/device/public/interfaces/battery_monitor.mojom.h"
23 #include "services/device/time_zone_monitor/time_zone_monitor.h" 23 #include "services/device/time_zone_monitor/time_zone_monitor.h"
24 #include "services/service_manager/public/cpp/bind_source_info.h" 24 #include "services/service_manager/public/cpp/bind_source_info.h"
25 #include "ui/gfx/native_widget_types.h" 25 #include "ui/gfx/native_widget_types.h"
26 26
27 #if defined(OS_ANDROID) 27 #if defined(OS_ANDROID)
28 #include "base/android/jni_android.h" 28 #include "base/android/jni_android.h"
29 #include "device/nfc/nfc_provider.mojom.h"
30 #include "jni/InterfaceRegistrar_jni.h" 29 #include "jni/InterfaceRegistrar_jni.h"
31 #include "services/device/android/register_jni.h" 30 #include "services/device/android/register_jni.h"
32 #include "services/device/screen_orientation/screen_orientation_listener_android .h" 31 #include "services/device/screen_orientation/screen_orientation_listener_android .h"
33 #else 32 #else
34 #include "services/device/battery/battery_monitor_impl.h" 33 #include "services/device/battery/battery_monitor_impl.h"
35 #include "services/device/battery/battery_status_service.h" 34 #include "services/device/battery/battery_status_service.h"
36 #include "services/device/vibration/vibration_manager_impl.h" 35 #include "services/device/vibration/vibration_manager_impl.h"
37 #endif 36 #endif
38 37
39 namespace device { 38 namespace device {
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 java_interface_provider_.Bind(std::move(provider)); 276 java_interface_provider_.Bind(std::move(provider));
278 277
279 java_interface_provider_initialized_ = true; 278 java_interface_provider_initialized_ = true;
280 } 279 }
281 280
282 return &java_interface_provider_; 281 return &java_interface_provider_;
283 } 282 }
284 #endif 283 #endif
285 284
286 } // namespace device 285 } // namespace device
OLDNEW
« no previous file with comments | « services/device/device_service.h ('k') | services/device/nfc/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698