| Index: device/vr/vr_device.cc
|
| diff --git a/device/vr/vr_device.cc b/device/vr/vr_device.cc
|
| index 5e3d7fc253d6fa29c2755622baf9241df7ca49b5..d4403e6d2c9d6a75153456b1ea9c0d361ec4ba83 100644
|
| --- a/device/vr/vr_device.cc
|
| +++ b/device/vr/vr_device.cc
|
| @@ -4,13 +4,14 @@
|
|
|
| #include "device/vr/vr_device.h"
|
| #include "device/vr/vr_device_provider.h"
|
| +#include "device/vr/vr_service_impl.h"
|
|
|
| namespace device {
|
|
|
| unsigned int VRDevice::next_id_ = 1;
|
|
|
| VRDevice::VRDevice(VRDeviceProvider* provider)
|
| - : provider_(provider), id_(next_id_) {
|
| + : presenting_service_(nullptr), provider_(provider), id_(next_id_) {
|
| // Prevent wraparound. Devices with this ID will be treated as invalid.
|
| if (next_id_ != VR_DEVICE_LAST_ID)
|
| next_id_++;
|
| @@ -18,8 +19,27 @@ VRDevice::VRDevice(VRDeviceProvider* provider)
|
|
|
| VRDevice::~VRDevice() {}
|
|
|
| -bool VRDevice::RequestPresent(bool secure_origin) {
|
| +bool VRDevice::RequestPresent(VRServiceImpl* service, bool secure_origin) {
|
| return true;
|
| };
|
|
|
| +void VRDevice::RegisterDisplayService(VRServiceImpl* service,
|
| + VRDisplayServicePtr display_service) {
|
| + display_services_.insert(std::pair<VRServiceImpl*, VRDisplayServicePtr>(
|
| + service, std::move(display_service)));
|
| +}
|
| +
|
| +void VRDevice::RemoveService(VRServiceImpl* service) {
|
| + ExitPresent(service);
|
| + display_services_.erase(service);
|
| +}
|
| +
|
| +bool VRDevice::CheckAccessAllowed(VRServiceImpl* service) {
|
| + return (!presenting_service_ || presenting_service_ == service);
|
| +}
|
| +
|
| +bool VRDevice::IsPresentingService(VRServiceImpl* service) {
|
| + return (presenting_service_ && presenting_service_ == service);
|
| +}
|
| +
|
| } // namespace device
|
|
|