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

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

Issue 2603553002: Ports VRService to be hosted in the device service.
Patch Set: Ports VRService to be hosted in the device service. Created 3 years, 11 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/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
11 #include "device/power_monitor/power_monitor_message_broadcaster.h" 11 #include "device/power_monitor/power_monitor_message_broadcaster.h"
12 #include "device/time_zone_monitor/time_zone_monitor.h" 12 #include "device/time_zone_monitor/time_zone_monitor.h"
13 #include "services/service_manager/public/cpp/connection.h" 13 #include "services/service_manager/public/cpp/connection.h"
14 #include "services/service_manager/public/cpp/interface_registry.h" 14 #include "services/service_manager/public/cpp/interface_registry.h"
15 15
16 namespace {
17
18 template <typename Interface>
19 void IgnoreInterfaceRequest(mojo::InterfaceRequest<Interface> request) {
20 // Intentionally ignore the interface request.
21 }
22
23 } // namespace
24
16 namespace device { 25 namespace device {
17 26
18 std::unique_ptr<service_manager::Service> CreateDeviceService( 27 std::unique_ptr<service_manager::Service> CreateDeviceService(
19 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) { 28 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) {
20 return base::MakeUnique<DeviceService>(std::move(file_task_runner)); 29 return base::MakeUnique<DeviceService>(std::move(file_task_runner));
21 } 30 }
22 31
23 DeviceService::DeviceService( 32 DeviceService::DeviceService(
24 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) 33 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
25 : file_task_runner_(std::move(file_task_runner)) {} 34 : file_task_runner_(std::move(file_task_runner)) {}
26 35
27 DeviceService::~DeviceService() {} 36 DeviceService::~DeviceService() {}
28 37
29 void DeviceService::OnStart() {} 38 void DeviceService::OnStart() {}
30 39
31 bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info, 40 bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info,
32 service_manager::InterfaceRegistry* registry) { 41 service_manager::InterfaceRegistry* registry) {
33 registry->AddInterface<mojom::PowerMonitor>(this); 42 registry->AddInterface<mojom::PowerMonitor>(this);
34 registry->AddInterface<mojom::TimeZoneMonitor>(this); 43 registry->AddInterface<mojom::TimeZoneMonitor>(this);
44 registry->AddInterface<mojom::VRService>(this);
35 return true; 45 return true;
36 } 46 }
37 47
38 void DeviceService::Create(const service_manager::Identity& remote_identity, 48 void DeviceService::Create(const service_manager::Identity& remote_identity,
39 mojom::PowerMonitorRequest request) { 49 mojom::PowerMonitorRequest request) {
40 PowerMonitorMessageBroadcaster::Create(std::move(request)); 50 PowerMonitorMessageBroadcaster::Create(std::move(request));
41 } 51 }
42 52
43 void DeviceService::Create(const service_manager::Identity& remote_identity, 53 void DeviceService::Create(const service_manager::Identity& remote_identity,
44 mojom::TimeZoneMonitorRequest request) { 54 mojom::TimeZoneMonitorRequest request) {
45 if (!time_zone_monitor_) 55 if (!time_zone_monitor_)
46 time_zone_monitor_ = device::TimeZoneMonitor::Create(file_task_runner_); 56 time_zone_monitor_ = device::TimeZoneMonitor::Create(file_task_runner_);
47 time_zone_monitor_->Bind(std::move(request)); 57 time_zone_monitor_->Bind(std::move(request));
48 } 58 }
49 59
60 void DeviceService::Create(const service_manager::Identity& remote_identity,
61 mojom::VRServiceRequest request) {
62 #if defined(ENABLE_WEBVR)
63 device::VRServiceImpl::Create(std::move(request));
64 #else
65 IgnoreInterfaceRequest<mojom::VRService>(std::move(request));
66 #endif
67 }
68
50 } // namespace device 69 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698