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

device/vr/vr_display_impl.h

Index: device/vr/vr_display_impl.h
diff --git a/device/vr/vr_display_impl.h b/device/vr/vr_display_impl.h
index 7116d520d1ad314bf74976376696bcbaec2824b2..6240e0cc03b79d8d51aae790983a865a4451177a 100644
--- a/device/vr/vr_display_impl.h
+++ b/device/vr/vr_display_impl.h
@@ -18,12 +18,25 @@ namespace device {
 
 class VRServiceImpl;
 
+// Browser process representation of a VRDevice within a WebVR site session
+// (see VRServiceImpl). VRDisplayImpl receives/sends VR device events
+// from/to mojom::VRDisplayClient (the render process representation of a VR
+// device).
+// VRDisplayImpl objects are owned by their respective VRServiceImpl instances.
 class VRDisplayImpl : public mojom::VRDisplay {
  public:
-  VRDisplayImpl(device::VRDevice* device, VRServiceImpl* service);
+  VRDisplayImpl(device::VRDevice* device,
+                VRServiceImpl* service,
+                mojom::VRServiceClient* service_client,
+                mojom::VRDisplayInfoPtr display_info);
   ~VRDisplayImpl() override;
 
-  mojom::VRDisplayClient* client() { return client_.get(); }
+  virtual void OnChanged(mojom::VRDisplayInfoPtr vr_device_info);
+  virtual void OnExitPresent();
+  virtual void OnBlur();
+  virtual void OnFocus();
+  virtual void OnActivate(mojom::VRDisplayEventReason reason);
+  virtual void OnDeactivate(mojom::VRDisplayEventReason reason);
 
  private:
   friend class VRDisplayImplTest;
@@ -45,8 +58,6 @@ class VRDisplayImpl : public mojom::VRDisplay {
                             bool secure_origin,
                             bool success);
 
-  void OnVRDisplayInfoCreated(mojom::VRDisplayInfoPtr display_info);
-
   mojo::Binding<mojom::VRDisplay> binding_;
   mojom::VRDisplayClientPtr client_;
   device::VRDevice* device_;