mojo VR interface simplified

device/vr/vr_service_impl.cc

Index: device/vr/vr_service_impl.cc
diff --git a/device/vr/vr_service_impl.cc b/device/vr/vr_service_impl.cc
index 6ea486de284d4d5e0e37bb7a7a36adb172b41a6b..735d23ead35a272eb11d358e55aaebba4f39cebf 100644
--- a/device/vr/vr_service_impl.cc
+++ b/device/vr/vr_service_impl.cc
@@ -30,62 +30,47 @@ void VRServiceImpl::Bind(mojo::InterfaceRequest<VRService> request) {
 }
 
 void VRServiceImpl::RemoveFromDeviceManager() {
+  device_client_impl_.clear();
   VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
   device_manager->RemoveService(this);
 }
 
-void VRServiceImpl::SetClient(VRServiceClientPtr client) {
-  DCHECK(!client_.get());
-
-  client_ = std::move(client);
-  VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
-  device_manager->AddService(this);
+void VRServiceImpl::RemoveDeviceClientImpl(VRDevice* device) {
+  device_client_impl_.erase(device);
 }
 
-void VRServiceImpl::GetDisplays(const GetDisplaysCallback& callback) {
-  VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
-  callback.Run(device_manager->GetVRDevices());
-}
+VRDeviceClientPtr VRServiceImpl::GetDeviceServicePtr(VRDevice* device) {
+  if (device_client_impl_.find(device) == device_client_impl_.end()) {
+    VRDeviceClientPtr deviceClient;
 
-void VRServiceImpl::GetPose(uint32_t index, const GetPoseCallback& callback) {
-  VRDevice* device = VRDeviceManager::GetAllowedDevice(this, index);
+    device_client_impl_[device] = std::unique_ptr<VRDeviceClientImpl>(
+        new VRDeviceClientImpl(GetProxy(&deviceClient), device, this));
 
-  if (device) {
-    callback.Run(device->GetPose());
-  } else {
-    callback.Run(nullptr);
+    return std::move(deviceClient);
   }
-}
 
-void VRServiceImpl::ResetPose(uint32_t index) {
-  VRDevice* device = VRDeviceManager::GetAllowedDevice(this, index);
-  if (device)
-    device->ResetPose();
+  return nullptr;
 }
 
-void VRServiceImpl::RequestPresent(uint32_t index,
-                                   bool secureOrigin,
-                                   const RequestPresentCallback& callback) {
+void VRServiceImpl::GetDisplays(const GetDisplaysCallback& callback) {
   VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
-  callback.Run(device_manager->RequestPresent(this, index, secureOrigin));
+  callback.Run(device_manager->GetVRDevices(this));
 }
 
-void VRServiceImpl::ExitPresent(uint32_t index) {
-  VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
-  device_manager->ExitPresent(this, index);
-}
+void VRServiceImpl::SetClient(VRServiceClientPtr client) {
+  DCHECK(!client_.get());
 
-void VRServiceImpl::SubmitFrame(uint32_t index, VRPosePtr pose) {
+  client_ = std::move(client);
   VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
-  device_manager->SubmitFrame(this, index, std::move(pose));
+  device_manager->AddService(this);
 }
 
-void VRServiceImpl::UpdateLayerBounds(uint32_t index,
-                                      VRLayerBoundsPtr leftBounds,
-                                      VRLayerBoundsPtr rightBounds) {
-  VRDevice* device = VRDeviceManager::GetAllowedDevice(this, index);
-  if (device)
-    device->UpdateLayerBounds(std::move(leftBounds), std::move(rightBounds));
+VRDisplayClientPtr VRServiceImpl::GetDisplayClient() {
+  DCHECK(client_);
+
+  VRDisplayClientPtr display_client;
+  client_->GetDisplayClient(&display_client);
+  return std::move(display_client);
 }
 
 }  // namespace device