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

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, 12 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/time_zone_monitor/time_zone_monitor.h" 11 #include "device/time_zone_monitor/time_zone_monitor.h"
12 #include "services/service_manager/public/cpp/connection.h" 12 #include "services/service_manager/public/cpp/connection.h"
13 #include "services/service_manager/public/cpp/interface_registry.h" 13 #include "services/service_manager/public/cpp/interface_registry.h"
14 14
15 #if defined(ENABLE_WEBVR)
16 #include "device/vr/vr_service_impl.h" //nogncheck
17 #endif
18
15 namespace device { 19 namespace device {
16 20
17 std::unique_ptr<service_manager::Service> CreateDeviceService( 21 std::unique_ptr<service_manager::Service> CreateDeviceService(
18 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) { 22 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) {
19 return base::MakeUnique<DeviceService>(std::move(file_task_runner)); 23 return base::MakeUnique<DeviceService>(std::move(file_task_runner));
20 } 24 }
21 25
22 DeviceService::DeviceService( 26 DeviceService::DeviceService(
23 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) 27 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
24 : file_task_runner_(std::move(file_task_runner)) {} 28 : file_task_runner_(std::move(file_task_runner)) {}
25 29
26 DeviceService::~DeviceService() {} 30 DeviceService::~DeviceService() {}
27 31
28 void DeviceService::OnStart() {} 32 void DeviceService::OnStart() {}
29 33
30 bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info, 34 bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info,
31 service_manager::InterfaceRegistry* registry) { 35 service_manager::InterfaceRegistry* registry) {
32 registry->AddInterface<mojom::TimeZoneMonitor>(this); 36 registry->AddInterface<mojom::TimeZoneMonitor>(this);
37 #if defined(ENABLE_WEBVR)
38 registry->AddInterface<mojom::VRService>(this);
39 #endif
33 return true; 40 return true;
34 } 41 }
35 42
36 void DeviceService::Create(const service_manager::Identity& remote_identity, 43 void DeviceService::Create(const service_manager::Identity& remote_identity,
37 mojom::TimeZoneMonitorRequest request) { 44 mojom::TimeZoneMonitorRequest request) {
38 if (!time_zone_monitor_) 45 if (!time_zone_monitor_)
39 time_zone_monitor_ = device::TimeZoneMonitor::Create(file_task_runner_); 46 time_zone_monitor_ = device::TimeZoneMonitor::Create(file_task_runner_);
40 time_zone_monitor_->Bind(std::move(request)); 47 time_zone_monitor_->Bind(std::move(request));
41 } 48 }
42 49
50 #if defined(ENABLE_WEBVR)
51 void DeviceService::Create(const service_manager::Identity& remote_identity,
52 mojom::VRServiceRequest request) {
53 device::VRServiceImpl::Create(std::move(request));
54 }
55 #endif
56
43 } // namespace device 57 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698