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

Unified Diff: device/vr/vr_device_manager.cc

Issue 2258513003: Revert of 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/vr/android/vr_jni_registrar.cc ('k') | third_party/gvr-android-sdk/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/vr/vr_device_manager.cc
diff --git a/device/vr/vr_device_manager.cc b/device/vr/vr_device_manager.cc
index 5bd11702f2f14a96b414cade33ffa240ebad35fe..b263be86e8cea92b2833053615f14fcc9624552f 100644
--- a/device/vr/vr_device_manager.cc
+++ b/device/vr/vr_device_manager.cc
@@ -7,12 +7,11 @@
#include <utility>
#include "base/bind.h"
-#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "build/build_config.h"
#if defined(OS_ANDROID)
-#include "device/vr/android/gvr/gvr_device_provider.h"
+#include "device/vr/android/cardboard/cardboard_vr_device_provider.h"
#endif
namespace device {
@@ -25,7 +24,9 @@
: vr_initialized_(false), keep_alive_(false) {
// Register VRDeviceProviders for the current platform
#if defined(OS_ANDROID)
- RegisterProvider(base::WrapUnique(new GvrDeviceProvider()));
+ std::unique_ptr<VRDeviceProvider> cardboard_provider(
+ new CardboardVRDeviceProvider());
+ RegisterProvider(std::move(cardboard_provider));
#endif
}
« no previous file with comments | « device/vr/android/vr_jni_registrar.cc ('k') | third_party/gvr-android-sdk/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698