Reland of Android WebVR implementation, Cardboard 0.5.5 SDK

content/browser/vr/vr_device_manager.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/vr/vr_device_manager.h"
 
+#include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "third_party/WebKit/public/platform/modules/vr/WebVR.h"
 
+#if defined(OS_ANDROID)
+#include "content/browser/vr/android/cardboard/cardboard_vr_device_provider.h"
+#endif
+
 namespace content {
 
 namespace {
 VRDeviceManager* g_vr_device_manager = nullptr;
 }
 
 VRDeviceManager::VRDeviceManager()
     : vr_initialized_(false), keep_alive_(false) {
-  bindings_.set_error_handler(this);
+  bindings_.set_connection_error_handler(
+      base::Bind(&VRDeviceManager::OnConnectionError, base::Unretained(this)));
 // Register VRDeviceProviders for the current platform
+#if defined(OS_ANDROID)
+  scoped_ptr<VRDeviceProvider> cardboard_provider(
+      new CardboardVRDeviceProvider());
+  RegisterProvider(cardboard_provider.Pass());
+#endif
 }
 
 VRDeviceManager::VRDeviceManager(scoped_ptr<VRDeviceProvider> provider)
     : vr_initialized_(false), keep_alive_(true) {
   thread_checker_.DetachFromThread();
   RegisterProvider(provider.Pass());
   SetInstance(this);
 }
 
 VRDeviceManager::~VRDeviceManager() {
@@ skipping 33 matching lines @@
   return !!g_vr_device_manager;
 }
 
 mojo::Array<VRDeviceInfoPtr> VRDeviceManager::GetVRDevices() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   InitializeProviders();
 
   std::vector<VRDevice*> devices;
   for (const auto& provider : providers_)
-    provider->GetDevices(devices);
+    provider->GetDevices(&devices);
 
   mojo::Array<VRDeviceInfoPtr> out_devices(0);
   for (const auto& device : devices) {
     if (device->id() == VR_DEVICE_LAST_ID)
       continue;
 
     if (devices_.find(device->id()) == devices_.end())
       devices_[device->id()] = device;
 
     VRDeviceInfoPtr vr_device_info = device->GetVRDevice();
@@ skipping 46 matching lines @@
   }
 }
 
 void VRDeviceManager::ResetSensor(uint32_t index) {
   VRDevice* device = GetDevice(index);
   if (device)
     device->ResetSensor();
 }
 
 }  // namespace content