mojo VR interface simplified

device/vr/vr_device.h

Index: device/vr/vr_device.h
diff --git a/device/vr/vr_device.h b/device/vr/vr_device.h
index 4121cfcba2268b2b4bd6b17d4bafc9d6e6a1dc0b..bb51a84f52e353084a9660ddc2a7e54cc3429d07 100644
--- a/device/vr/vr_device.h
+++ b/device/vr/vr_device.h
@@ -19,6 +19,7 @@ class BaseWindow;
 
 namespace device {
 
+class VRServiceImpl;
 class VRDeviceProvider;
 
 const unsigned int VR_DEVICE_LAST_ID = 0xFFFFFFFF;
@@ -32,14 +33,32 @@ class DEVICE_VR_EXPORT VRDevice {
   unsigned int id() const { return id_; }
 
   virtual VRDisplayPtr GetVRDevice() = 0;
-  virtual VRPosePtr GetPose() = 0;
-  virtual void ResetPose() = 0;
-
-  virtual bool RequestPresent(bool secure_origin);
-  virtual void ExitPresent(){};
-  virtual void SubmitFrame(VRPosePtr pose){};
-  virtual void UpdateLayerBounds(VRLayerBoundsPtr leftBounds,
-                                 VRLayerBoundsPtr rightBounds){};
+  virtual VRPosePtr GetPose(VRServiceImpl* service) = 0;
+  virtual void ResetPose(VRServiceImpl* service) = 0;
+
+  virtual bool RequestPresent(VRServiceImpl* service, bool secure_origin) = 0;
+  virtual void ExitPresent(VRServiceImpl* service) = 0;
+  virtual void SubmitFrame(VRServiceImpl* service, VRPosePtr pose) = 0;
+  virtual void UpdateLayerBounds(VRServiceImpl* service,
+                                 VRLayerBoundsPtr leftBounds,
+                                 VRLayerBoundsPtr rightBounds) = 0;
+
+  virtual void RegisterDisplayService(VRServiceImpl* service,
+                                      VRDisplayServicePtr display_service);
+  virtual void RemoveService(VRServiceImpl* service);
+  virtual bool CheckAccessAllowed(VRServiceImpl* service);
+  virtual bool IsPresentingService(VRServiceImpl* service);
+
+  virtual void OnDisplayChanged() = 0;
+  virtual void OnExitPresent(VRServiceImpl* service) = 0;
+  virtual void OnDisplayConnected() = 0;
+  virtual void OnDisplayDisconnected() = 0;
+
+ protected:
+  using DisplayServiceMap = std::map<VRServiceImpl*, VRDisplayServicePtr>;
+  DisplayServiceMap display_services_;
+
+  VRServiceImpl* presenting_service_;
 
  private:
   VRDeviceProvider* provider_;