mojo VR interface simplified

device/vr/android/gvr/gvr_device_provider.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/vr/android/gvr/gvr_device_provider.h"
 
 #include <jni.h>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
@@ skipping 18 matching lines @@
 
 GvrDeviceProvider::~GvrDeviceProvider() {
   device::GvrDelegateProvider* delegate_provider =
       device::GvrDelegateProvider::GetInstance();
   if (delegate_provider)
     delegate_provider->DestroyNonPresentingDelegate();
 
   ExitPresent();
 }
 
-void GvrDeviceProvider::GetDevices(std::vector<VRDevice*>* devices) {
-  Initialize();
+void GvrDeviceProvider::GetDevices(std::vector<VRServiceImpl*>* clients,
+                                   std::vector<VRDevice*>* devices) {
+  Initialize(clients);
 
   if (vr_device_)
     devices->push_back(vr_device_.get());
 }
 
-void GvrDeviceProvider::SetClient(VRClientDispatcher* client) {
-  if (!client_)
-    client_.reset(client);
-}
-
-void GvrDeviceProvider::Initialize() {
+void GvrDeviceProvider::Initialize(std::vector<VRServiceImpl*>* clients) {
   device::GvrDelegateProvider* delegate_provider =
       device::GvrDelegateProvider::GetInstance();
   if (!delegate_provider)
     return;
 
   if (!vr_device_) {
     vr_device_.reset(
         new GvrDevice(this, delegate_provider->GetNonPresentingDelegate()));
-    client_->OnDeviceConnectionStatusChanged(vr_device_.get(), true);
+    vr_device_->SetClient(clients);
+    vr_device_->OnDisplayConnected();
   }
 }
 
 bool GvrDeviceProvider::RequestPresent() {
   device::GvrDelegateProvider* delegate_provider =
       device::GvrDelegateProvider::GetInstance();
   if (!delegate_provider)
     return false;
 
   // RequestWebVRPresent is async as a render thread may be created.
@@ skipping 10 matching lines @@
       device::GvrDelegateProvider::GetInstance();
   if (!delegate_provider)
     return;
 
   vr_device_->SetDelegate(delegate_provider->GetNonPresentingDelegate());
 
   GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory(
       GAMEPAD_SOURCE_GVR);
 
   delegate_provider->ExitWebVRPresent();
-
-  if (client_)
-    client_->OnPresentEnded(vr_device_.get());
 }
 
 void GvrDeviceProvider::OnGvrDelegateReady(GvrDelegate* delegate) {
   main_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&GvrDeviceProvider::GvrDelegateReady, base::Unretained(this),
                  base::Unretained(delegate)));
 }
 
 void GvrDeviceProvider::OnGvrDelegateRemoved() {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
   if (!vr_device_)
     return;
   ExitPresent();
 }
 
 void GvrDeviceProvider::GvrDelegateReady(GvrDelegate* delegate) {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
 
   vr_device_->SetDelegate(delegate);
   GamepadDataFetcherManager::GetInstance()->AddFactory(
       new GvrGamepadDataFetcher::Factory(delegate, vr_device_->id()));
 }
 
 }  // namespace device