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 "device/vr/vr_device_manager.h" | 5 #include "device/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/ptr_util.h" | |
11 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
12 #include "build/build_config.h" | 11 #include "build/build_config.h" |
13 | 12 |
14 #if defined(OS_ANDROID) | 13 #if defined(OS_ANDROID) |
15 #include "device/vr/android/gvr/gvr_device_provider.h" | 14 #include "device/vr/android/cardboard/cardboard_vr_device_provider.h" |
16 #endif | 15 #endif |
17 | 16 |
18 namespace device { | 17 namespace device { |
19 | 18 |
20 namespace { | 19 namespace { |
21 VRDeviceManager* g_vr_device_manager = nullptr; | 20 VRDeviceManager* g_vr_device_manager = nullptr; |
22 } | 21 } |
23 | 22 |
24 VRDeviceManager::VRDeviceManager() | 23 VRDeviceManager::VRDeviceManager() |
25 : vr_initialized_(false), keep_alive_(false) { | 24 : vr_initialized_(false), keep_alive_(false) { |
26 // Register VRDeviceProviders for the current platform | 25 // Register VRDeviceProviders for the current platform |
27 #if defined(OS_ANDROID) | 26 #if defined(OS_ANDROID) |
28 RegisterProvider(base::WrapUnique(new GvrDeviceProvider())); | 27 std::unique_ptr<VRDeviceProvider> cardboard_provider( |
| 28 new CardboardVRDeviceProvider()); |
| 29 RegisterProvider(std::move(cardboard_provider)); |
29 #endif | 30 #endif |
30 } | 31 } |
31 | 32 |
32 VRDeviceManager::VRDeviceManager(std::unique_ptr<VRDeviceProvider> provider) | 33 VRDeviceManager::VRDeviceManager(std::unique_ptr<VRDeviceProvider> provider) |
33 : vr_initialized_(false), keep_alive_(true) { | 34 : vr_initialized_(false), keep_alive_(true) { |
34 thread_checker_.DetachFromThread(); | 35 thread_checker_.DetachFromThread(); |
35 RegisterProvider(std::move(provider)); | 36 RegisterProvider(std::move(provider)); |
36 SetInstance(this); | 37 SetInstance(this); |
37 } | 38 } |
38 | 39 |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 | 137 |
137 vr_initialized_ = true; | 138 vr_initialized_ = true; |
138 } | 139 } |
139 | 140 |
140 void VRDeviceManager::RegisterProvider( | 141 void VRDeviceManager::RegisterProvider( |
141 std::unique_ptr<VRDeviceProvider> provider) { | 142 std::unique_ptr<VRDeviceProvider> provider) { |
142 providers_.push_back(make_linked_ptr(provider.release())); | 143 providers_.push_back(make_linked_ptr(provider.release())); |
143 } | 144 } |
144 | 145 |
145 } // namespace device | 146 } // namespace device |
OLD | NEW |