Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Side by Side Diff: device/vr/vr_device.h

Issue 2493063004: Fix exiting WebVR via Android UI not fully exiting fullscreen. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_DEVICE_H 5 #ifndef DEVICE_VR_VR_DEVICE_H
6 #define DEVICE_VR_VR_DEVICE_H 6 #define DEVICE_VR_VR_DEVICE_H
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "device/vr/vr_export.h" 9 #include "device/vr/vr_export.h"
10 #include "device/vr/vr_service.mojom.h" 10 #include "device/vr/vr_service.mojom.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 virtual void AddService(VRServiceImpl* service); 47 virtual void AddService(VRServiceImpl* service);
48 virtual void RemoveService(VRServiceImpl* service); 48 virtual void RemoveService(VRServiceImpl* service);
49 49
50 // TODO(shaobo.yan@intel.com): Checks should be done against VRDisplayImpl and 50 // TODO(shaobo.yan@intel.com): Checks should be done against VRDisplayImpl and
51 // the name should be considered. 51 // the name should be considered.
52 virtual bool IsAccessAllowed(VRServiceImpl* service); 52 virtual bool IsAccessAllowed(VRServiceImpl* service);
53 virtual bool IsPresentingService(VRServiceImpl* service); 53 virtual bool IsPresentingService(VRServiceImpl* service);
54 54
55 virtual void OnDisplayChanged(); 55 virtual void OnDisplayChanged();
56 virtual void OnExitPresent(VRServiceImpl* service); 56 virtual void OnExitPresent();
57 57
58 protected: 58 protected:
59 // Each Service have one VRDisplay with one VRDevice. 59 // Each Service have one VRDisplay with one VRDevice.
60 // TODO(shaobo.yan@intel.com): Since the VRDisplayImpl knows its VRServiceImpl 60 // TODO(shaobo.yan@intel.com): Since the VRDisplayImpl knows its VRServiceImpl
61 // we should 61 // we should
62 // only need to store the VRDisplayImpl. 62 // only need to store the VRDisplayImpl.
63 using DisplayClientMap = std::map<VRServiceImpl*, VRDisplayImpl*>; 63 using DisplayClientMap = std::map<VRServiceImpl*, VRDisplayImpl*>;
64 DisplayClientMap displays_; 64 DisplayClientMap displays_;
65 65
66 // TODO(shaobo.yan@intel.com): Should track presenting VRDisplayImpl instead. 66 // TODO(shaobo.yan@intel.com): Should track presenting VRDisplayImpl instead.
67 VRServiceImpl* presenting_service_; 67 VRServiceImpl* presenting_service_;
68 68
69 private: 69 private:
70 VRDeviceProvider* provider_; 70 VRDeviceProvider* provider_;
71 unsigned int id_; 71 unsigned int id_;
72 72
73 static unsigned int next_id_; 73 static unsigned int next_id_;
74 74
75 DISALLOW_COPY_AND_ASSIGN(VRDevice); 75 DISALLOW_COPY_AND_ASSIGN(VRDevice);
76 }; 76 };
77 77
78 } // namespace device 78 } // namespace device
79 79
80 #endif // DEVICE_VR_VR_DEVICE_H 80 #endif // DEVICE_VR_VR_DEVICE_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698