Switch WebVR to handle GvrApi management through VrShellDelegate

device/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 "device/vr/vr_device_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 116 matching lines @@
     if (device->id() == VR_DEVICE_LAST_ID)
       continue;
 
     if (devices_.find(device->id()) == devices_.end())
       devices_[device->id()] = device;
 
     VRDisplayPtr vr_device_info = device->GetVRDevice();
     if (vr_device_info.is_null())
       continue;
 
-    vr_device_info->index = device->id();
+    // GetVRDevice should always set the index of the VRDisplay to its own id.
+    DCHECK(vr_device_info->index == device->id());
+
     out_devices.push_back(std::move(vr_device_info));
   }
 
   return out_devices;
 }
 
 VRDevice* VRDeviceManager::GetDevice(unsigned int index) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (index == 0) {
@@ skipping 108 matching lines @@
     vr_device_info->index = device->id();
 
     for (const auto& service : services_)
       service->client()->OnDisplayConnected(vr_device_info.Clone());
   } else {
     for (const auto& service : services_)
       service->client()->OnDisplayDisconnected(device->id());
   }
 }
 
+void VRDeviceManager::OnPresentEnded(VRDevice* device) {
+  // Ensure the presenting device is the one that we've been requested to stop.
+  if (!presenting_device_ || presenting_device_ != device)
+    return;
+
+  // Should never have a presenting device without a presenting service.
+  DCHECK(presenting_service_);
+
+  // Notify the presenting service that it's been forced to end presentation.
+  presenting_service_->client()->OnExitPresent(device->id());
+
+  // Clear the presenting service and device.
+  presenting_service_ = nullptr;
+  presenting_device_ = nullptr;
+}
+
 void VRDeviceManager::InitializeProviders() {
   if (vr_initialized_) {
     return;
   }
 
   for (const auto& provider : providers_) {
     provider->SetClient(this);
     provider->Initialize();
   }
 
@@ skipping 19 matching lines @@
   for (const auto& provider : providers_)
     provider->PollEvents();
 }
 
 void VRDeviceManager::StopSchedulingPollEvents() {
   if (has_scheduled_poll_)
     timer_.Stop();
 }
 
 }  // namespace device