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

device/vr/vr_display_impl.cc

 // Copyright 2016 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 <utility>
 
 #include "base/bind.h"
 #include "device/vr/vr_device.h"
 #include "device/vr/vr_service_impl.h"
 
 namespace device {
 
-VRDisplayImpl::VRDisplayImpl(device::VRDevice* device, VRServiceImpl* service)
+VRDisplayImpl::VRDisplayImpl(device::VRDevice* device,
+                             VRServiceImpl* service,
+                             mojom::VRServiceClient* service_client,
+                             mojom::VRDisplayInfoPtr display_info)
     : binding_(this),
       device_(device),
       service_(service),
       weak_ptr_factory_(this) {
-  base::Callback<void(mojom::VRDisplayInfoPtr)> callback = base::Bind(
-      &VRDisplayImpl::OnVRDisplayInfoCreated, weak_ptr_factory_.GetWeakPtr());
-  device->GetVRDevice(callback);
-}
-
-void VRDisplayImpl::OnVRDisplayInfoCreated(
-    mojom::VRDisplayInfoPtr display_info) {
-  if (service_->client() && display_info) {
-    service_->client()->OnDisplayConnected(binding_.CreateInterfacePtrAndBind(),
-                                           mojo::MakeRequest(&client_),
-                                           std::move(display_info));
-  }
+  device_->AddDisplay(this);
+  service_client->OnDisplayConnected(binding_.CreateInterfacePtrAndBind(),
+                                     mojo::MakeRequest(&client_),
+                                     std::move(display_info));
 }
 
 VRDisplayImpl::~VRDisplayImpl() {
   device_->RemoveDisplay(this);
 }
 
+void VRDisplayImpl::OnChanged(mojom::VRDisplayInfoPtr vr_device_info) {
+  client_->OnChanged(std::move(vr_device_info));
+}
+
+void VRDisplayImpl::OnExitPresent() {
+  client_->OnExitPresent();
+}
+
+void VRDisplayImpl::OnBlur() {
+  client_->OnBlur();
+}
+
+void VRDisplayImpl::OnFocus() {
+  client_->OnFocus();
+}
+
+void VRDisplayImpl::OnActivate(mojom::VRDisplayEventReason reason) {
+  client_->OnActivate(reason);
+}
+
+void VRDisplayImpl::OnDeactivate(mojom::VRDisplayEventReason reason) {
+  client_->OnDeactivate(reason);
+}
+
 void VRDisplayImpl::ResetPose() {
   if (!device_->IsAccessAllowed(this))
     return;
 
   device_->ResetPose();
 }
 
 void VRDisplayImpl::RequestPresent(bool secure_origin,
                                    const RequestPresentCallback& callback) {
   if (!device_->IsAccessAllowed(this)) {
@@ skipping 37 matching lines @@
                              std::move(right_bounds));
 }
 
 void VRDisplayImpl::GetVRVSyncProvider(mojom::VRVSyncProviderRequest request) {
   if (!device_->IsAccessAllowed(this)) {
     return;
   }
   device_->GetVRVSyncProvider(std::move(request));
 }
 }