Index: device/vr/android/gvr/gvr_device_provider.cc |
diff --git a/device/vr/android/gvr/gvr_device_provider.cc b/device/vr/android/gvr/gvr_device_provider.cc |
index 8a3637d25902a91e6e08143cae45ada582d26a32..def37e84f69c54de1a345de028564ceb036660b7 100644 |
--- a/device/vr/android/gvr/gvr_device_provider.cc |
+++ b/device/vr/android/gvr/gvr_device_provider.cc |
@@ -65,23 +65,11 @@ bool GvrDeviceProvider::RequestPresent() { |
return delegate_provider->RequestWebVRPresent(this); |
} |
+// VR presentation exit requested by the API |
mthiesse
2016/11/14 16:24:12
super nit: periods at the end of comments, here an
|
void GvrDeviceProvider::ExitPresent() { |
DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); |
- if (!vr_device_) |
- return; |
- |
- device::GvrDelegateProvider* delegate_provider = |
- device::GvrDelegateProvider::GetInstance(); |
- if (!delegate_provider) |
- return; |
- |
- vr_device_->SetDelegate(delegate_provider->GetNonPresentingDelegate()); |
- |
- GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory( |
- GAMEPAD_SOURCE_GVR); |
- |
- delegate_provider->ExitWebVRPresent(); |
+ SwitchToNonPresentingDelegate(); |
mthiesse
2016/11/14 16:24:12
Why do we not call vr_device_->OnExitPresent() her
bajones
2016/11/14 19:35:43
This is confusing (need to look at how to make thi
mthiesse
2016/11/14 20:06:49
Fine to leave it for now I guess, but that definit
|
} |
void GvrDeviceProvider::OnGvrDelegateReady(GvrDelegate* delegate) { |
@@ -91,11 +79,14 @@ void GvrDeviceProvider::OnGvrDelegateReady(GvrDelegate* delegate) { |
base::Unretained(delegate))); |
} |
+// VR presentation exit requested by the delegate (probably via UI) |
void GvrDeviceProvider::OnGvrDelegateRemoved() { |
DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); |
if (!vr_device_) |
return; |
- ExitPresent(); |
+ |
+ SwitchToNonPresentingDelegate(); |
+ vr_device_->OnExitPresent(); |
} |
void GvrDeviceProvider::GvrDelegateReady(GvrDelegate* delegate) { |
@@ -106,4 +97,19 @@ void GvrDeviceProvider::GvrDelegateReady(GvrDelegate* delegate) { |
new GvrGamepadDataFetcher::Factory(delegate, vr_device_->id())); |
} |
+void GvrDeviceProvider::SwitchToNonPresentingDelegate() { |
+ GvrDelegateProvider* delegate_provider = GvrDelegateProvider::GetInstance(); |
+ if (!vr_device_ || !delegate_provider) |
+ return; |
+ |
+ vr_device_->SetDelegate(delegate_provider->GetNonPresentingDelegate()); |
+ |
+ // Remove GVR gamepad polling. |
+ GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory( |
+ GAMEPAD_SOURCE_GVR); |
+ |
+ // If we're presenting currently stop. |
+ delegate_provider->ExitWebVRPresent(); |
+} |
+ |
} // namespace device |