Fixes 2D-to-WebVR site transitions when browsing in VR.

device/vr/vr_device.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.h"
 #include "device/vr/vr_device_provider.h"
 #include "device/vr/vr_display_impl.h"
 
 namespace device {
 
@@ skipping 22 matching lines @@
   return (!presenting_display_ || presenting_display_ == display);
 }
 
 bool VRDevice::CheckPresentingDisplay(VRDisplayImpl* display) {
   return (presenting_display_ && presenting_display_ == display);
 }
 
 void VRDevice::OnChanged() {
   base::Callback<void(mojom::VRDisplayInfoPtr)> callback = base::Bind(
       &VRDevice::OnVRDisplayInfoCreated, weak_ptr_factory_.GetWeakPtr());
-  GetVRDevice(callback);
+  CreateVRDisplayInfo(callback);
 }
 
 void VRDevice::OnVRDisplayInfoCreated(mojom::VRDisplayInfoPtr vr_device_info) {
   if (vr_device_info.is_null())
     return;
   for (auto* display : displays_)
-    display->client()->OnChanged(vr_device_info.Clone());
+    display->OnChanged(vr_device_info.Clone());
 }
 
 void VRDevice::OnExitPresent() {
   if (!presenting_display_)
     return;
   auto it = displays_.find(presenting_display_);
   CHECK(it != displays_.end());
-  (*it)->client()->OnExitPresent();
+  (*it)->OnExitPresent();
   SetPresentingDisplay(nullptr);
 }
 
 void VRDevice::OnBlur() {
   for (auto* display : displays_)
-    display->client()->OnBlur();
+    display->OnBlur();
 }
 
 void VRDevice::OnFocus() {
   for (auto* display : displays_)
-    display->client()->OnFocus();
+    display->OnFocus();
 }
 
 void VRDevice::OnActivate(mojom::VRDisplayEventReason reason) {
   for (auto* display : displays_)
-    display->client()->OnActivate(reason);
+    display->OnActivate(reason);
 }
 
 void VRDevice::OnDeactivate(mojom::VRDisplayEventReason reason) {
   for (auto* display : displays_)
-    display->client()->OnDeactivate(reason);
+    display->OnDeactivate(reason);
 }
 
 void VRDevice::SetPresentingDisplay(VRDisplayImpl* display) {
   presenting_display_ = display;
 }
 
 }  // namespace device