OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "content/browser/vr/vr_device_manager.h" | 5 #include "content/browser/vr/vr_device_manager.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "third_party/WebKit/public/platform/modules/vr/WebVR.h" | 12 #include "third_party/WebKit/public/platform/modules/vr/WebVR.h" |
13 | 13 |
14 #if defined(OS_ANDROID) | 14 #if defined(OS_ANDROID) |
15 #include "content/browser/vr/android/cardboard/cardboard_vr_device_provider.h" | 15 #include "content/browser/vr/android/cardboard/cardboard_vr_device_provider.h" |
16 #endif | 16 #endif |
17 | 17 |
18 namespace content { | 18 namespace content { |
19 | 19 |
20 namespace { | 20 namespace { |
21 VRDeviceManager* g_vr_device_manager = nullptr; | 21 VRDeviceManager* g_vr_device_manager = nullptr; |
22 } | 22 } |
23 | 23 |
24 VRDeviceManager::VRDeviceManager() | 24 VRDeviceManager::VRDeviceManager() |
25 : vr_initialized_(false), keep_alive_(false) { | 25 : vr_initialized_(false), keep_alive_(false) { |
26 bindings_.set_connection_error_handler( | 26 bindings_.set_connection_error_handler( |
27 base::Bind(&VRDeviceManager::OnConnectionError, base::Unretained(this))); | 27 base::Bind(&VRDeviceManager::OnConnectionError, base::Unretained(this))); |
28 // Register VRDeviceProviders for the current platform | 28 // Register VRDeviceProviders for the current platform |
29 #if defined(OS_ANDROID) | 29 #if defined(OS_ANDROID) |
30 scoped_ptr<VRDeviceProvider> cardboard_provider( | 30 std::unique_ptr<VRDeviceProvider> cardboard_provider( |
31 new CardboardVRDeviceProvider()); | 31 new CardboardVRDeviceProvider()); |
32 RegisterProvider(std::move(cardboard_provider)); | 32 RegisterProvider(std::move(cardboard_provider)); |
33 #endif | 33 #endif |
34 } | 34 } |
35 | 35 |
36 VRDeviceManager::VRDeviceManager(scoped_ptr<VRDeviceProvider> provider) | 36 VRDeviceManager::VRDeviceManager(std::unique_ptr<VRDeviceProvider> provider) |
37 : vr_initialized_(false), keep_alive_(true) { | 37 : vr_initialized_(false), keep_alive_(true) { |
38 thread_checker_.DetachFromThread(); | 38 thread_checker_.DetachFromThread(); |
39 RegisterProvider(std::move(provider)); | 39 RegisterProvider(std::move(provider)); |
40 SetInstance(this); | 40 SetInstance(this); |
41 } | 41 } |
42 | 42 |
43 VRDeviceManager::~VRDeviceManager() { | 43 VRDeviceManager::~VRDeviceManager() { |
44 DCHECK(thread_checker_.CalledOnValidThread()); | 44 DCHECK(thread_checker_.CalledOnValidThread()); |
45 g_vr_device_manager = nullptr; | 45 g_vr_device_manager = nullptr; |
46 } | 46 } |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 if (vr_initialized_) { | 120 if (vr_initialized_) { |
121 return; | 121 return; |
122 } | 122 } |
123 | 123 |
124 for (const auto& provider : providers_) | 124 for (const auto& provider : providers_) |
125 provider->Initialize(); | 125 provider->Initialize(); |
126 | 126 |
127 vr_initialized_ = true; | 127 vr_initialized_ = true; |
128 } | 128 } |
129 | 129 |
130 void VRDeviceManager::RegisterProvider(scoped_ptr<VRDeviceProvider> provider) { | 130 void VRDeviceManager::RegisterProvider( |
| 131 std::unique_ptr<VRDeviceProvider> provider) { |
131 providers_.push_back(make_linked_ptr(provider.release())); | 132 providers_.push_back(make_linked_ptr(provider.release())); |
132 } | 133 } |
133 | 134 |
134 void VRDeviceManager::GetDevices(const GetDevicesCallback& callback) { | 135 void VRDeviceManager::GetDevices(const GetDevicesCallback& callback) { |
135 callback.Run(GetVRDevices()); | 136 callback.Run(GetVRDevices()); |
136 } | 137 } |
137 | 138 |
138 void VRDeviceManager::GetSensorState(uint32_t index, | 139 void VRDeviceManager::GetSensorState(uint32_t index, |
139 const GetSensorStateCallback& callback) { | 140 const GetSensorStateCallback& callback) { |
140 VRDevice* device = GetDevice(index); | 141 VRDevice* device = GetDevice(index); |
141 if (device) { | 142 if (device) { |
142 callback.Run(device->GetSensorState()); | 143 callback.Run(device->GetSensorState()); |
143 } else { | 144 } else { |
144 callback.Run(nullptr); | 145 callback.Run(nullptr); |
145 } | 146 } |
146 } | 147 } |
147 | 148 |
148 void VRDeviceManager::ResetSensor(uint32_t index) { | 149 void VRDeviceManager::ResetSensor(uint32_t index) { |
149 VRDevice* device = GetDevice(index); | 150 VRDevice* device = GetDevice(index); |
150 if (device) | 151 if (device) |
151 device->ResetSensor(); | 152 device->ResetSensor(); |
152 } | 153 } |
153 | 154 |
154 } // namespace content | 155 } // namespace content |
OLD | NEW |