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

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

Issue 2745443002: [Device Service] Port ScreenOrientationListener into Device Service. (Closed)
Patch Set: Add DEPS Created 3 years, 9 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/single_thread_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 11 #include "base/threading/thread_task_runner_handle.h"
11 #include "services/device/fingerprint/fingerprint.h" 12 #include "services/device/fingerprint/fingerprint.h"
12 #include "services/device/power_monitor/power_monitor_message_broadcaster.h" 13 #include "services/device/power_monitor/power_monitor_message_broadcaster.h"
13 #include "services/device/time_zone_monitor/time_zone_monitor.h" 14 #include "services/device/time_zone_monitor/time_zone_monitor.h"
14 #include "services/service_manager/public/cpp/connection.h" 15 #include "services/service_manager/public/cpp/connection.h"
15 #include "services/service_manager/public/cpp/interface_registry.h" 16 #include "services/service_manager/public/cpp/interface_registry.h"
16 17
17 #if defined(OS_ANDROID) 18 #if defined(OS_ANDROID)
18 #include "services/device/android/register_jni.h" 19 #include "services/device/android/register_jni.h"
20 #include "services/device/screen_orientation/screen_orientation_listener_android .h"
19 #endif 21 #endif
20 22
21 namespace device { 23 namespace device {
22 24
23 std::unique_ptr<service_manager::Service> CreateDeviceService( 25 std::unique_ptr<service_manager::Service> CreateDeviceService(
24 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) { 26 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
27 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) {
25 #if defined(OS_ANDROID) 28 #if defined(OS_ANDROID)
26 if (!EnsureJniRegistered()) { 29 if (!EnsureJniRegistered()) {
27 DLOG(ERROR) << "Failed to register JNI for Device Service"; 30 DLOG(ERROR) << "Failed to register JNI for Device Service";
28 return nullptr; 31 return nullptr;
29 } 32 }
30 #endif 33 #endif
31 34
32 return base::MakeUnique<DeviceService>(std::move(file_task_runner)); 35 return base::MakeUnique<DeviceService>(std::move(file_task_runner),
36 std::move(io_task_runner));
33 } 37 }
34 38
35 DeviceService::DeviceService( 39 DeviceService::DeviceService(
36 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) 40 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
37 : file_task_runner_(std::move(file_task_runner)) {} 41 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
42 : file_task_runner_(std::move(file_task_runner)),
43 io_task_runner_(std::move(io_task_runner)) {}
38 44
39 DeviceService::~DeviceService() {} 45 DeviceService::~DeviceService() {}
40 46
41 void DeviceService::OnStart() {} 47 void DeviceService::OnStart() {}
42 48
43 bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info, 49 bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info,
44 service_manager::InterfaceRegistry* registry) { 50 service_manager::InterfaceRegistry* registry) {
45 registry->AddInterface<mojom::Fingerprint>(this); 51 registry->AddInterface<mojom::Fingerprint>(this);
46 registry->AddInterface<mojom::PowerMonitor>(this); 52 registry->AddInterface<mojom::PowerMonitor>(this);
53 registry->AddInterface<mojom::ScreenOrientationListener>(this);
47 registry->AddInterface<mojom::TimeZoneMonitor>(this); 54 registry->AddInterface<mojom::TimeZoneMonitor>(this);
55
48 return true; 56 return true;
49 } 57 }
50 58
51 void DeviceService::Create(const service_manager::Identity& remote_identity, 59 void DeviceService::Create(const service_manager::Identity& remote_identity,
52 mojom::FingerprintRequest request) { 60 mojom::FingerprintRequest request) {
53 Fingerprint::Create(std::move(request)); 61 Fingerprint::Create(std::move(request));
54 } 62 }
55 63
56 void DeviceService::Create(const service_manager::Identity& remote_identity, 64 void DeviceService::Create(const service_manager::Identity& remote_identity,
57 mojom::PowerMonitorRequest request) { 65 mojom::PowerMonitorRequest request) {
58 if (!power_monitor_message_broadcaster_) { 66 if (!power_monitor_message_broadcaster_) {
59 power_monitor_message_broadcaster_ = 67 power_monitor_message_broadcaster_ =
60 base::MakeUnique<PowerMonitorMessageBroadcaster>(); 68 base::MakeUnique<PowerMonitorMessageBroadcaster>();
61 } 69 }
62 power_monitor_message_broadcaster_->Bind(std::move(request)); 70 power_monitor_message_broadcaster_->Bind(std::move(request));
63 } 71 }
64 72
65 void DeviceService::Create(const service_manager::Identity& remote_identity, 73 void DeviceService::Create(const service_manager::Identity& remote_identity,
74 mojom::ScreenOrientationListenerRequest request) {
75 #if defined(OS_ANDROID)
76 if (io_task_runner_) {
77 io_task_runner_->PostTask(
78 FROM_HERE, base::Bind(&ScreenOrientationListenerAndroid::Create,
79 base::Passed(&request)));
80 }
81 #endif
82 }
83
84 void DeviceService::Create(const service_manager::Identity& remote_identity,
66 mojom::TimeZoneMonitorRequest request) { 85 mojom::TimeZoneMonitorRequest request) {
67 if (!time_zone_monitor_) 86 if (!time_zone_monitor_)
68 time_zone_monitor_ = device::TimeZoneMonitor::Create(file_task_runner_); 87 time_zone_monitor_ = TimeZoneMonitor::Create(file_task_runner_);
69 time_zone_monitor_->Bind(std::move(request)); 88 time_zone_monitor_->Bind(std::move(request));
70 } 89 }
71 90
72 } // namespace device 91 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698