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

Side by Side Diff: device/vr/vr_device_manager.cc

Issue 2219203002: Migrate WebVR Cardboard implementation to GVR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gvr_third_party
Patch Set: Created 4 years, 4 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 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/singleton.h" 10 #include "base/memory/singleton.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 12
13 #if defined(OS_ANDROID) 13 #if defined(OS_ANDROID)
14 #include "device/vr/android/cardboard/cardboard_vr_device_provider.h" 14 #include "device/vr/android/google_vr/google_vr_device_provider.h"
15 #endif 15 #endif
16 16
17 namespace device { 17 namespace device {
18 18
19 namespace { 19 namespace {
20 VRDeviceManager* g_vr_device_manager = nullptr; 20 VRDeviceManager* g_vr_device_manager = nullptr;
21 } 21 }
22 22
23 VRDeviceManager::VRDeviceManager() 23 VRDeviceManager::VRDeviceManager()
24 : vr_initialized_(false), keep_alive_(false) { 24 : vr_initialized_(false), keep_alive_(false) {
25 // Register VRDeviceProviders for the current platform 25 // Register VRDeviceProviders for the current platform
26 #if defined(OS_ANDROID) 26 #if defined(OS_ANDROID)
27 std::unique_ptr<VRDeviceProvider> cardboard_provider( 27 std::unique_ptr<VRDeviceProvider> google_vr_provider(
28 new CardboardVRDeviceProvider()); 28 new GoogleVRDeviceProvider());
29 RegisterProvider(std::move(cardboard_provider)); 29 RegisterProvider(std::move(google_vr_provider));
30 #endif 30 #endif
31 } 31 }
32 32
33 VRDeviceManager::VRDeviceManager(std::unique_ptr<VRDeviceProvider> provider) 33 VRDeviceManager::VRDeviceManager(std::unique_ptr<VRDeviceProvider> provider)
34 : vr_initialized_(false), keep_alive_(true) { 34 : vr_initialized_(false), keep_alive_(true) {
35 thread_checker_.DetachFromThread(); 35 thread_checker_.DetachFromThread();
36 RegisterProvider(std::move(provider)); 36 RegisterProvider(std::move(provider));
37 SetInstance(this); 37 SetInstance(this);
38 } 38 }
39 39
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 vr_initialized_ = true; 138 vr_initialized_ = true;
139 } 139 }
140 140
141 void VRDeviceManager::RegisterProvider( 141 void VRDeviceManager::RegisterProvider(
142 std::unique_ptr<VRDeviceProvider> provider) { 142 std::unique_ptr<VRDeviceProvider> provider) {
143 providers_.push_back(make_linked_ptr(provider.release())); 143 providers_.push_back(make_linked_ptr(provider.release()));
144 } 144 }
145 145
146 } // namespace device 146 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698