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..13dc2d81ea0571b2da8507c094cc7baa7777203a 100644
--- a/device/vr/vr_service_impl.cc
+++ b/device/vr/vr_service_impl.cc
@@ -18,74 +18,59 @@ VRServiceImpl::~VRServiceImpl() {
   RemoveFromDeviceManager();
 }
 
-void VRServiceImpl::BindRequest(mojo::InterfaceRequest<VRService> request) {
+void VRServiceImpl::BindRequest(
+    mojo::InterfaceRequest<mojom::VRService> request) {
   VRServiceImpl* service = new VRServiceImpl();
   service->Bind(std::move(request));
 }
 
-void VRServiceImpl::Bind(mojo::InterfaceRequest<VRService> request) {
-  binding_.reset(new mojo::Binding<VRService>(this, std::move(request)));
+void VRServiceImpl::Bind(mojo::InterfaceRequest<mojom::VRService> request) {
+  binding_.reset(new mojo::Binding<mojom::VRService>(this, std::move(request)));
   binding_->set_connection_error_handler(base::Bind(
       &VRServiceImpl::RemoveFromDeviceManager, base::Unretained(this)));
 }
 
 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());
-}
+mojom::VRDevicePtr VRServiceImpl::GetDevicePtr(VRDevice* device) {
+  if (device_client_impl_.find(device) == device_client_impl_.end()) {
+    mojom::VRDevicePtr 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);
   }
+  return nullptr;
 }
 
-void VRServiceImpl::ResetPose(uint32_t index) {
-  VRDevice* device = VRDeviceManager::GetAllowedDevice(this, index);
-  if (device)
-    device->ResetPose();
-}
-
-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(mojom::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));
+mojom::VRDisplayClientPtr VRServiceImpl::GetDisplayClient() {
+  DCHECK(client_);
+
+  mojom::VRDisplayClientPtr display_client;
+  client_->GetDisplayClient(&display_client);
+  return display_client;
 }
 
 }  // namespace device