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

device/vr/android/gvr/gvr_device.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 "device/vr/android/gvr/gvr_device.h"
 
 #include <math.h>
 #include <algorithm>
 
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "device/vr/android/gvr/gvr_device_provider.h"
 #include "device/vr/vr_device_manager.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"
 
 namespace device {
 
 GvrDevice::GvrDevice(GvrDeviceProvider* provider)
     : VRDevice(), gvr_provider_(provider) {}
 
 GvrDevice::~GvrDevice() {}
 
-void GvrDevice::GetVRDevice(
-    const base::Callback<void(mojom::VRDisplayInfoPtr)>& callback) {
+void GvrDevice::CreateVRDisplayInfo(
+    const base::Callback<void(mojom::VRDisplayInfoPtr)>& onCreated) {
   GvrDelegate* delegate = GetGvrDelegate();
   if (delegate) {
-    delegate->CreateVRDisplayInfo(callback, id());
+    delegate->CreateVRDisplayInfo(onCreated, id());
   } else {
-    callback.Run(mojom::VRDisplayInfoPtr(nullptr));
+    onCreated.Run(mojom::VRDisplayInfoPtr(nullptr));

[dcheng, 2017/03/16 05:38:22]

Unrelated, but this is typically written:

on_created.Run(nullptr);  // nullptr_t overload is purposely implicit

or

on_created.Run(mojom::VRDisplayInfoPtr());

[tiborg, 2017/03/16 15:02:39]

Done.

   }
 }
 
 void GvrDevice::ResetPose() {
   GvrDelegate* delegate = GetGvrDelegate();
   if (delegate)
     delegate->ResetPose();
 }
 
 void GvrDevice::RequestPresent(const base::Callback<void(bool)>& callback) {
@@ skipping 59 matching lines @@
 }
 
 GvrDelegate* GvrDevice::GetGvrDelegate() {
   GvrDelegateProvider* delegate_provider = GvrDelegateProvider::GetInstance();
   if (delegate_provider)
     return delegate_provider->GetDelegate();
   return nullptr;
 }
 
 }  // namespace device