Chromium Code Reviews| Index: chrome/browser/android/vr_shell/vr_shell.cc |
| diff --git a/chrome/browser/android/vr_shell/vr_shell.cc b/chrome/browser/android/vr_shell/vr_shell.cc |
| index 55f52727cd2627b42c12750b28c125447574f25b..89c464b8d6efc2c4c3c59df12f5d30a341758d0e 100644 |
| --- a/chrome/browser/android/vr_shell/vr_shell.cc |
| +++ b/chrome/browser/android/vr_shell/vr_shell.cc |
| @@ -225,6 +225,11 @@ void VrShell::OnContentPaused(bool paused) { |
| delegate_provider_->device_provider()->Device()->OnFocus(); |
| } |
| +void VrShell::NavigateBack() { |
| + JNIEnv* env = base::android::AttachCurrentThread(); |
| + Java_VrShellImpl_navigateBack(env, j_vr_shell_.obj()); |
|
amp
2017/05/08 21:45:24
I was going to say we should wire up exiting full
tiborg
2017/05/09 15:00:36
Also, isn't fullscreen automatically exited when y
amp
2017/05/09 16:38:07
Yes it should be, although I'm not sure where that
|
| +} |
| + |
| void VrShell::OnTriggerEvent(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| gl_thread_->task_runner()->PostTask( |
| FROM_HERE, |
| @@ -414,13 +419,6 @@ void VrShell::DoUiAction(const UiAction action, |
| const base::DictionaryValue* arguments) { |
| // Actions that can be handled natively. |
| switch (action) { |
| - case HISTORY_BACK: |
| - if (web_contents_ && web_contents_->IsFullscreen()) { |
| - web_contents_->ExitFullscreen(false); |
| - return; |
| - } |
| - // Otherwise handle in java. |
| - break; |
| case EXIT_PRESENT: |
| delegate_provider_->ExitWebVRPresent(); |
| return; |
| @@ -442,9 +440,6 @@ void VrShell::DoUiAction(const UiAction action, |
| Java_VrShellImpl_openNewTab(env, j_vr_shell_.obj(), incognito); |
| return; |
| } |
| - case HISTORY_BACK: |
| - Java_VrShellImpl_navigateBack(env, j_vr_shell_.obj()); |
| - break; |
| case HISTORY_FORWARD: |
| Java_VrShellImpl_navigateForward(env, j_vr_shell_.obj()); |
| break; |