Switch WebVR to handle GvrApi management through VrShellDelegate

device/vr/android/gvr/gvr_device.cc

Index: device/vr/android/gvr/gvr_device.cc
diff --git a/device/vr/android/gvr/gvr_device.cc b/device/vr/android/gvr/gvr_device.cc
index d00fc9424b327340d9b18c4b05952c8666dd178d..89353322cdf3a3624e06e0b4dd2fb55a0ce1d78e 100644
--- a/device/vr/android/gvr/gvr_device.cc
+++ b/device/vr/android/gvr/gvr_device.cc
@@ -10,6 +10,7 @@
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
+#include "device/vr/vr_device_manager.h"
 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr.h"
 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
 #include "ui/gfx/transform.h"
@@ -23,18 +24,26 @@ static const uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;
 
 }  // namespace
 
-GvrDevice::GvrDevice(VRDeviceProvider* provider, GvrDelegate* delegate)
-    : VRDevice(provider), delegate_(delegate) {}
+GvrDevice::GvrDevice(GvrDeviceProvider* provider, GvrDelegate* delegate)
+    : VRDevice(provider), delegate_(delegate), gvr_provider_(provider) {}
 
 GvrDevice::~GvrDevice() {}
 
 VRDisplayPtr GvrDevice::GetVRDevice() {
   TRACE_EVENT0("input", "GvrDevice::GetVRDevice");
 
-  gvr::GvrApi* gvr_api = delegate_->gvr_api();
+  gvr::GvrApi* gvr_api = GetGvrApi();
+  if (!gvr_api)
+    return nullptr;
 
   VRDisplayPtr device = VRDisplay::New();
 
+  device->index = id();
+
+  std::string vendor = gvr_api->GetViewerVendor();
+  std::string model = gvr_api->GetViewerModel();
+  device->displayName = vendor + " " + model;
+
   device->capabilities = VRDisplayCapabilities::New();
   device->capabilities->hasOrientation = true;
   device->capabilities->hasPosition = false;
@@ -46,8 +55,6 @@ VRDisplayPtr GvrDevice::GetVRDevice() {
   VREyeParametersPtr& left_eye = device->leftEye;
   VREyeParametersPtr& right_eye = device->rightEye;
 
-  device->displayName = gvr_api->GetViewerModel();
-
   gvr::BufferViewportList gvr_buffer_viewports =
       gvr_api->CreateEmptyBufferViewportList();
   gvr_buffer_viewports.SetToRecommendedBufferViewports();
@@ -100,7 +107,9 @@ VRDisplayPtr GvrDevice::GetVRDevice() {
 VRPosePtr GvrDevice::GetPose() {
   TRACE_EVENT0("input", "GvrDevice::GetSensorState");
 
-  gvr::GvrApi* gvr_api = delegate_->gvr_api();
+  gvr::GvrApi* gvr_api = GetGvrApi();
+  if (!gvr_api)
+    return nullptr;
 
   VRPosePtr pose = VRPose::New();
 
@@ -138,24 +147,29 @@ VRPosePtr GvrDevice::GetPose() {
 }
 
 void GvrDevice::ResetPose() {
-  delegate_->gvr_api()->ResetTracking();
+  gvr::GvrApi* gvr_api = GetGvrApi();
+  if (gvr_api)
+    gvr_api->ResetTracking();
 }
 
 bool GvrDevice::RequestPresent() {
-  delegate_->RequestWebVRPresent();
-  return true;
+  return gvr_provider_->RequestPresent();
 }
 
 void GvrDevice::ExitPresent() {
-  delegate_->ExitWebVRPresent();
+  gvr_provider_->ExitPresent();
 }
 
 void GvrDevice::SubmitFrame(VRPosePtr pose) {
-  delegate_->SubmitWebVRFrame();
+  if (delegate_)
+    delegate_->SubmitWebVRFrame();
 }
 
 void GvrDevice::UpdateLayerBounds(VRLayerBoundsPtr leftBounds,
                                   VRLayerBoundsPtr rightBounds) {
+  if (!delegate_)
+    return;
+
   delegate_->UpdateWebVRTextureBounds(0,  // Left eye
                                       leftBounds->left, leftBounds->top,
                                       leftBounds->width, leftBounds->height);
@@ -164,4 +178,19 @@ void GvrDevice::UpdateLayerBounds(VRLayerBoundsPtr leftBounds,
                                       rightBounds->width, rightBounds->height);
 }
 
+void GvrDevice::SetDelegate(GvrDelegate* delegate) {
+  delegate_ = delegate;
+
+  // Notify the clients that this device has changed
+  if (delegate_)
+    VRDeviceManager::GetInstance()->OnDeviceChanged(GetVRDevice());
+}
+
+gvr::GvrApi* GvrDevice::GetGvrApi() {
+  if (!delegate_)
+    return nullptr;
+
+  return delegate_->gvr_api();
+}
+
 }  // namespace device