| OLD | NEW | 
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef DEVICE_VR_VR_SERVICE_IMPL_H | 5 #ifndef DEVICE_VR_VR_SERVICE_IMPL_H | 
| 6 #define DEVICE_VR_VR_SERVICE_IMPL_H | 6 #define DEVICE_VR_VR_SERVICE_IMPL_H | 
| 7 | 7 | 
| 8 #include <memory> | 8 #include <memory> | 
| 9 | 9 | 
| 10 #include "base/macros.h" | 10 #include "base/macros.h" | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 53 | 53 | 
| 54   void SetListeningForActivate(bool listening) override; | 54   void SetListeningForActivate(bool listening) override; | 
| 55   void OnVRDisplayInfoCreated(VRDevice* device, | 55   void OnVRDisplayInfoCreated(VRDevice* device, | 
| 56                               mojom::VRDisplayInfoPtr display_info); | 56                               mojom::VRDisplayInfoPtr display_info); | 
| 57 | 57 | 
| 58   std::map<VRDevice*, std::unique_ptr<VRDisplayImpl>> displays_; | 58   std::map<VRDevice*, std::unique_ptr<VRDisplayImpl>> displays_; | 
| 59 | 59 | 
| 60   mojom::VRServiceClientPtr client_; | 60   mojom::VRServiceClientPtr client_; | 
| 61 | 61 | 
| 62   bool listening_for_activate_; | 62   bool listening_for_activate_; | 
|  | 63   unsigned connected_devices_; | 
| 63 | 64 | 
| 64   base::WeakPtrFactory<VRServiceImpl> weak_ptr_factory_; | 65   base::WeakPtrFactory<VRServiceImpl> weak_ptr_factory_; | 
| 65 | 66 | 
| 66   // Getter for testing. | 67   // Getter for testing. | 
| 67   DEVICE_VR_EXPORT VRDisplayImpl* GetVRDisplayImplForTesting(VRDevice* device); | 68   DEVICE_VR_EXPORT VRDisplayImpl* GetVRDisplayImplForTesting(VRDevice* device); | 
| 68 | 69 | 
| 69   DISALLOW_COPY_AND_ASSIGN(VRServiceImpl); | 70   DISALLOW_COPY_AND_ASSIGN(VRServiceImpl); | 
| 70 }; | 71 }; | 
| 71 | 72 | 
| 72 }  // namespace device | 73 }  // namespace device | 
| 73 | 74 | 
| 74 #endif  // DEVICE_VR_VR_SERVICE_IMPL_H | 75 #endif  // DEVICE_VR_VR_SERVICE_IMPL_H | 
| OLD | NEW | 
|---|