Reland of App button click exits WebVR presentation.

chrome/browser/android/vr_shell/vr_shell.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 "chrome/browser/android/vr_shell/vr_shell.h"
 
 #include <android/native_window_jni.h>
 
 #include <string>
 #include <utility>
@@ skipping 407 matching lines @@
                                      height));
   compositor_->SetWindowBounds(gfx::Size(width, height));
 }
 
 // Note that the following code is obsolete and is here as reference for the
 // actions that need to be implemented natively.
 void VrShell::DoUiAction(const UiAction action,
                          const base::DictionaryValue* arguments) {
   // Actions that can be handled natively.
   switch (action) {
-    case EXIT_PRESENT:
-      delegate_provider_->ExitWebVRPresent();
-      return;
     default:
       break;
   }
   // Actions that are handled in java.
   JNIEnv* env = base::android::AttachCurrentThread();
   switch (action) {
     case SHOW_TAB: {
       int id;
       CHECK(arguments->GetInteger("id", &id));
       Java_VrShellImpl_showTab(env, j_vr_shell_.obj(), id);
@@ skipping 39 matching lines @@
 void VrShell::ContentWasShown() {
   if (web_contents_)
     input_manager_ = base::MakeUnique<VrInputManager>(web_contents_);
 }
 
 void VrShell::ForceExitVr() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_VrShellImpl_forceExitVr(env, j_vr_shell_.obj());
 }
 
+void VrShell::ExitPresent() {
+  delegate_provider_->ExitWebVRPresent();
+}
+
 void VrShell::OnVRVsyncProviderRequest(
     device::mojom::VRVSyncProviderRequest request) {
   PostToGlThreadWhenReady(base::Bind(&VrShellGl::OnRequest,
                                      gl_thread_->GetVrShellGl(),
                                      base::Passed(&request)));
 }
 
 void VrShell::UpdateVSyncInterval(int64_t timebase_nanos,
                                   double interval_seconds) {
   PostToGlThreadWhenReady(base::Bind(&VrShellGl::UpdateVSyncInterval,
@@ skipping 51 matching lines @@
            jlong gvr_api,
            jboolean reprojected_rendering) {
   return reinterpret_cast<intptr_t>(new VrShell(
       env, obj, reinterpret_cast<ui::WindowAndroid*>(window_android),
       for_web_vr, in_cct,
       VrShellDelegate::GetNativeVrShellDelegate(env, delegate),
       reinterpret_cast<gvr_context*>(gvr_api), reprojected_rendering));
 }
 
 }  // namespace vr_shell