Refine VRDevice Class

device/vr/vr_device.h

 // 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.
 
 #ifndef DEVICE_VR_VR_DEVICE_H
 #define DEVICE_VR_VR_DEVICE_H
 
 #include "base/macros.h"
 #include "device/vr/vr_export.h"
 #include "device/vr/vr_service.mojom.h"
 
 namespace blink {
 struct WebHMDSensorState;
 }
 
 namespace ui {
 class BaseWindow;
 }
 
 namespace device {
 
 class VRDisplayImpl;
-class VRServiceImpl;
 
 const unsigned int VR_DEVICE_LAST_ID = 0xFFFFFFFF;
 
 class DEVICE_VR_EXPORT VRDevice {
  public:
   VRDevice();
   virtual ~VRDevice();
 
   unsigned int id() const { return id_; }
 
   virtual mojom::VRDisplayInfoPtr GetVRDevice() = 0;
   virtual mojom::VRPosePtr GetPose() = 0;
   virtual void ResetPose() = 0;
 
   virtual void RequestPresent(const base::Callback<void(bool)>& callback) = 0;
   virtual void SetSecureOrigin(bool secure_origin) = 0;
   virtual void ExitPresent() = 0;
   virtual void SubmitFrame(mojom::VRPosePtr pose) = 0;
   virtual void UpdateLayerBounds(mojom::VRLayerBoundsPtr left_bounds,
                                  mojom::VRLayerBoundsPtr right_bounds) = 0;
 
-  virtual void AddService(VRServiceImpl* service);
-  virtual void RemoveService(VRServiceImpl* service);
+  virtual void AddDisplay(VRDisplayImpl* display);
+  virtual void RemoveDisplay(VRDisplayImpl* display);
 
-  // TODO(shaobo.yan@intel.com): Checks should be done against VRDisplayImpl and
-  // the name should be considered.
-  virtual bool IsAccessAllowed(VRServiceImpl* service);
-  virtual bool IsPresentingService(VRServiceImpl* service);
+  virtual bool IsAccessAllowed(VRDisplayImpl* display);
+  virtual bool CheckPresentingDisplay(VRDisplayImpl* display);
 
   virtual void OnChanged();
   virtual void OnExitPresent();
   virtual void OnBlur();
   virtual void OnFocus();
   virtual void OnActivate(mojom::VRDisplayEventReason reason);
   virtual void OnDeactivate(mojom::VRDisplayEventReason reason);
 
  protected:
   friend class VRDisplayImpl;
   friend class VRDisplayImplTest;
 
-  void SetPresentingService(VRServiceImpl* service);
+  void SetPresentingDisplay(VRDisplayImpl* display);
 
  private:
   // Each Service have one VRDisplay with one VRDevice.

[bajones, 2016/11/30 17:41:22]

This comment should be updated or removed. It's accurate, but no longer makes
sense in context.

-  // TODO(shaobo.yan@intel.com): Since the VRDisplayImpl knows its VRServiceImpl
-  // we should
-  // only need to store the VRDisplayImpl.
-  using DisplayClientMap = std::map<VRServiceImpl*, VRDisplayImpl*>;
-  DisplayClientMap displays_;
+  using DisplaySet = std::set<VRDisplayImpl*>;

[mthiesse, 2016/11/30 13:59:04]

nit: Not sure if this using is useful or improves readability anymore, you might
consider just removing it.

+  DisplaySet displays_;
 
-  // TODO(shaobo.yan@intel.com): Should track presenting VRDisplayImpl instead.
-  VRServiceImpl* presenting_service_;
+  VRDisplayImpl* presenting_display_;
 
   unsigned int id_;
 
   static unsigned int next_id_;
 
   DISALLOW_COPY_AND_ASSIGN(VRDevice);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_VR_VR_DEVICE_H