Adding Chrome-side WebVR interface

content/browser/vr/vr_service.cc

Index: content/browser/vr/vr_service.cc
diff --git a/content/browser/vr/vr_service.cc b/content/browser/vr/vr_service.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6b81b3f9eb0efba10c4e1bbd916425188325e140
--- /dev/null
+++ b/content/browser/vr/vr_service.cc
@@ -0,0 +1,110 @@
+// 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_service.h"
+
+#include "base/memory/singleton.h"
+#include "third_party/WebKit/public/platform/WebVR.h"
+
+#if defined(OS_ANDROID)
+#include "content/browser/vr/cardboard/cardboard_vr_device_provider.h"
+#endif
+
+namespace content {
+
+void DeleteVRDeviceProvider(VRDeviceProvider* provider) {

[no sievers, 2015/03/19 01:24:52]

nit: anonymous namespace around this

Or better: you can actually use a lambda below:
std::for_each(providers_.begin(), providers_.end(), [](VRDeviceProvider* p){
delete p; });

+  delete provider;
+}
+
+VRService::VRService() :
+    vr_initialized_(false) {
+#if defined(OS_ANDROID)
+  RegisterProvider(new CardboardVRDeviceProvider());
+#endif
+}
+
+VRService::VRService(VRDeviceProvider* provider) :
+    vr_initialized_(false) {
+  RegisterProvider(provider);
+}
+
+VRService::~VRService() {
+  std::for_each(providers_.begin(), providers_.end(), DeleteVRDeviceProvider);
+}
+
+void VRService::Initialize() {
+  if(vr_initialized_ == true) {
+    return;
+  }
+
+  ProviderList::iterator iter;
+  for (iter = providers_.begin(); iter != providers_.end(); ++iter) {
+    (*iter)->Initialize();
+  }
+
+  vr_initialized_ = true;
+}
+
+void VRService::Shutdown() {
+  if(vr_initialized_ == false) {
+    return;
+  }
+
+  ProviderList::iterator iter;
+  for (iter = providers_.begin(); iter != providers_.end(); ++iter) {
+    (*iter)->Shutdown();
+  }
+
+  vr_initialized_ = false;
+}
+
+VRService* VRService::GetInstance() {
+  return Singleton<VRService,
+                   LeakySingletonTraits<VRService> >::get();

[no sievers, 2015/03/19 01:24:51]

Ah wait, so why even bother... VRDeviceProviders never get deleted?

+}
+
+void VRService::GetVRDevices(
+    std::vector<blink::WebVRDevice>* webvr_devices) {
+  Initialize();
+
+  if(webvr_devices == NULL)
+    return;
+
+  webvr_devices->clear();
+
+  ProviderList::iterator iter;
+
+  std::vector<VRDevice*> devices;
+
+  for (iter = providers_.begin(); iter != providers_.end(); ++iter) {
+    (*iter)->GetDevices(devices);
+  }
+
+  std::vector<VRDevice*>::iterator diter;
+  for (diter = devices.begin(); diter != devices.end(); ++diter) {
+    VRDevice* device = *diter;
+    if (devices_.find(device->id()) == devices_.end()) {
+      devices_[device->id()] = device;
+    }
+
+    blink::WebVRDevice webvr_device;
+    device->GetVRDevice(&webvr_device);
+    webvr_device.index = device->id();
+    webvr_devices->push_back(webvr_device);
+  }
+}
+
+VRDevice* VRService::GetDevice(unsigned int index) {
+  DeviceMap::iterator iter = devices_.find(index);
+  if (iter == devices_.end()) {
+    return NULL;
+  }
+  return iter->second;
+}
+
+void VRService::RegisterProvider(VRDeviceProvider* provider) {
+  providers_.push_back(provider);
+}
+
+}  // namespace content