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

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

Issue 2865653002: [Device Service] Decouple NFC implementation from //content (Closed)
Patch Set: Response to review + fix for tests that don't actually run on bots 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
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 #ifndef SERVICES_DEVICE_DEVICE_SERVICE_H_ 5 #ifndef SERVICES_DEVICE_DEVICE_SERVICE_H_
6 #define SERVICES_DEVICE_DEVICE_SERVICE_H_ 6 #define SERVICES_DEVICE_DEVICE_SERVICE_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "device/generic_sensor/public/interfaces/sensor_provider.mojom.h" 9 #include "device/generic_sensor/public/interfaces/sensor_provider.mojom.h"
10 #include "device/screen_orientation/public/interfaces/screen_orientation.mojom.h " 10 #include "device/screen_orientation/public/interfaces/screen_orientation.mojom.h "
11 #include "device/sensors/public/interfaces/motion.mojom.h" 11 #include "device/sensors/public/interfaces/motion.mojom.h"
12 #include "device/sensors/public/interfaces/orientation.mojom.h" 12 #include "device/sensors/public/interfaces/orientation.mojom.h"
13 #include "device/wake_lock/public/interfaces/wake_lock_context_provider.mojom.h" 13 #include "device/wake_lock/public/interfaces/wake_lock_context_provider.mojom.h"
14 #include "device/wake_lock/wake_lock_service_context.h" 14 #include "device/wake_lock/wake_lock_service_context.h"
15 #include "mojo/public/cpp/bindings/binding_set.h" 15 #include "mojo/public/cpp/bindings/binding_set.h"
16 #include "services/device/public/interfaces/battery_monitor.mojom.h" 16 #include "services/device/public/interfaces/battery_monitor.mojom.h"
17 #include "services/device/public/interfaces/fingerprint.mojom.h" 17 #include "services/device/public/interfaces/fingerprint.mojom.h"
18 #include "services/device/public/interfaces/power_monitor.mojom.h" 18 #include "services/device/public/interfaces/power_monitor.mojom.h"
19 #include "services/device/public/interfaces/time_zone_monitor.mojom.h" 19 #include "services/device/public/interfaces/time_zone_monitor.mojom.h"
20 #include "services/device/public/interfaces/vibration_manager.mojom.h" 20 #include "services/device/public/interfaces/vibration_manager.mojom.h"
21 #include "services/service_manager/public/cpp/binder_registry.h" 21 #include "services/service_manager/public/cpp/binder_registry.h"
22 #include "services/service_manager/public/cpp/interface_provider.h" 22 #include "services/service_manager/public/cpp/interface_provider.h"
23 #include "services/service_manager/public/cpp/service.h" 23 #include "services/service_manager/public/cpp/service.h"
24 24
25 #if defined(OS_ANDROID)
26 #include "base/android/scoped_java_ref.h"
27 #endif
28
25 namespace base { 29 namespace base {
26 class SingleThreadTaskRunner; 30 class SingleThreadTaskRunner;
27 } 31 }
28 32
29 namespace device { 33 namespace device {
30 34
31 class PowerMonitorMessageBroadcaster; 35 class PowerMonitorMessageBroadcaster;
32 class TimeZoneMonitor; 36 class TimeZoneMonitor;
33 37
34 #if defined(OS_ANDROID) 38 #if defined(OS_ANDROID)
39 // NOTE: See the comments on the definitions of |WakeLockContextCallback|
40 // and NFCDelegate.java to understand the semantics and usage of these
41 // parameters.
35 std::unique_ptr<service_manager::Service> CreateDeviceService( 42 std::unique_ptr<service_manager::Service> CreateDeviceService(
36 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, 43 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
37 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 44 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
38 const WakeLockContextCallback& wake_lock_context_callback); 45 const WakeLockContextCallback& wake_lock_context_callback,
46 const base::android::JavaRef<jobject>& java_nfc_delegate);
39 #else 47 #else
40 std::unique_ptr<service_manager::Service> CreateDeviceService( 48 std::unique_ptr<service_manager::Service> CreateDeviceService(
41 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, 49 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
42 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner); 50 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner);
43 #endif 51 #endif
44 52
45 class DeviceService : public service_manager::Service { 53 class DeviceService : public service_manager::Service {
46 public: 54 public:
47 #if defined(OS_ANDROID) 55 #if defined(OS_ANDROID)
48 DeviceService(scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, 56 DeviceService(scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
49 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 57 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
50 const WakeLockContextCallback& wake_lock_context_callback); 58 const WakeLockContextCallback& wake_lock_context_callback,
59 const base::android::JavaRef<jobject>& java_nfc_delegate);
51 #else 60 #else
52 DeviceService(scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, 61 DeviceService(scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
53 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner); 62 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner);
54 #endif 63 #endif
55 ~DeviceService() override; 64 ~DeviceService() override;
56 65
57 private: 66 private:
58 // service_manager::Service: 67 // service_manager::Service:
59 void OnStart() override; 68 void OnStart() override;
60 void OnBindInterface(const service_manager::BindSourceInfo& source_info, 69 void OnBindInterface(const service_manager::BindSourceInfo& source_info,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 const service_manager::BindSourceInfo& source_info, 111 const service_manager::BindSourceInfo& source_info,
103 mojom::TimeZoneMonitorRequest request); 112 mojom::TimeZoneMonitorRequest request);
104 113
105 void BindWakeLockContextProviderRequest( 114 void BindWakeLockContextProviderRequest(
106 const service_manager::BindSourceInfo& source_info, 115 const service_manager::BindSourceInfo& source_info,
107 mojom::WakeLockContextProviderRequest request); 116 mojom::WakeLockContextProviderRequest request);
108 117
109 std::unique_ptr<PowerMonitorMessageBroadcaster> 118 std::unique_ptr<PowerMonitorMessageBroadcaster>
110 power_monitor_message_broadcaster_; 119 power_monitor_message_broadcaster_;
111 std::unique_ptr<TimeZoneMonitor> time_zone_monitor_; 120 std::unique_ptr<TimeZoneMonitor> time_zone_monitor_;
121 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
122 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
123
124 WakeLockContextCallback wake_lock_context_callback_;
125
112 #if defined(OS_ANDROID) 126 #if defined(OS_ANDROID)
113 // Binds |java_interface_provider_| to an interface registry that exposes 127 // Binds |java_interface_provider_| to an interface registry that exposes
114 // factories for the interfaces that are provided via Java on Android. 128 // factories for the interfaces that are provided via Java on Android.
115 service_manager::InterfaceProvider* GetJavaInterfaceProvider(); 129 service_manager::InterfaceProvider* GetJavaInterfaceProvider();
116 130
117 // InterfaceProvider that is bound to the Java-side interface registry. 131 // InterfaceProvider that is bound to the Java-side interface registry.
118 service_manager::InterfaceProvider java_interface_provider_; 132 service_manager::InterfaceProvider java_interface_provider_;
119 133
120 bool java_interface_provider_initialized_; 134 bool java_interface_provider_initialized_;
135
136 base::android::ScopedJavaGlobalRef<jobject> java_nfc_delegate_;
121 #endif 137 #endif
122 138
123 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
124 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
125
126 WakeLockContextCallback wake_lock_context_callback_;
127
128 service_manager::BinderRegistry registry_; 139 service_manager::BinderRegistry registry_;
129 140
130 DISALLOW_COPY_AND_ASSIGN(DeviceService); 141 DISALLOW_COPY_AND_ASSIGN(DeviceService);
131 }; 142 };
132 143
133 } // namespace device 144 } // namespace device
134 145
135 #endif // SERVICES_DEVICE_DEVICE_SERVICE_H_ 146 #endif // SERVICES_DEVICE_DEVICE_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698