Let HTML UI fully manage menu mode.

- Have native pass app button presses up to the UI.
- The UI decides whether or not to be in menu mode.
- The UI may call back down to native to pause content, if desired.

BUG=644565
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2664973002
Cr-Commit-Position: refs/heads/master@{#448017}

chrome/browser/android/vr_shell/ui_interface.cc

@@ -27,11 +27,6 @@ void UiInterface::SetMode(Mode mode) {
   FlushModeState();
 }
 
-void UiInterface::SetMenuMode(bool enabled) {
-  menu_mode_ = enabled;
-  FlushModeState();
-}
-
 void UiInterface::SetFullscreen(bool enabled) {
   fullscreen_ = enabled;
   FlushModeState();
@@ -49,7 +44,6 @@ void UiInterface::SetOmniboxSuggestions(
 
 void UiInterface::FlushModeState() {
   updates_.SetInteger("mode", static_cast<int>(mode_));
-  updates_.SetBoolean("menuMode", menu_mode_);
   updates_.SetBoolean("fullscreen", fullscreen_);
   FlushUpdates();
 }
@@ -117,6 +111,11 @@ void UiInterface::SetURL(const GURL& url) {
   FlushUpdates();
 }
 
+void UiInterface::HandleAppButtonClicked() {
+  updates_.SetBoolean("appButtonClicked", true);
+  FlushUpdates();
+}
+
 void UiInterface::OnDomContentsLoaded() {
   loaded_ = true;
 #if defined(ENABLE_VR_SHELL_UI_DEV)

chrome/browser/android/vr_shell/ui_interface.h

@@ -33,12 +33,9 @@ class UiInterface {
   explicit UiInterface(Mode initial_mode, bool fullscreen);
   virtual ~UiInterface();
 
+  // Set HTML UI state or pass events.
   void SetMode(Mode mode);
-  Mode GetMode() { return mode_; }
-  void SetMenuMode(bool enabled);
-  bool GetMenuMode() { return menu_mode_; }
   void SetFullscreen(bool enabled);
-  bool GetFullscreen() { return fullscreen_; }
   void SetSecurityLevel(int level);
   void SetWebVRSecureOrigin(bool secure);
   void SetLoading(bool loading);
@@ -49,13 +46,13 @@ class UiInterface {
   void UpdateTab(bool incognito, int id, const std::string& title);
   void RemoveTab(bool incognito, int id);
   void SetURL(const GURL& url);
-
-  // Omnibox input and output handling.
-  void HandleOmniboxInput(const base::DictionaryValue& input);
   void SetOmniboxSuggestions(std::unique_ptr<base::Value> suggestions);
+  void HandleAppButtonClicked();
 
-  // Called by WebUI when starting VR.
+  // Handlers for HTML UI commands and notifications.
   void OnDomContentsLoaded();
+  void HandleOmniboxInput(const base::DictionaryValue& input);
+
   void SetUiCommandHandler(UiCommandHandler* handler);
 
  private:
@@ -63,7 +60,6 @@ class UiInterface {
   void FlushModeState();
 
   Mode mode_;
-  bool menu_mode_ = false;
   bool fullscreen_ = false;
   UiCommandHandler* handler_;
   bool loaded_ = false;

chrome/browser/android/vr_shell/vr_shell.cc

@@ -132,8 +132,7 @@ void VrShell::SwapContents(JNIEnv* env, const JavaParamRef<jobject>& obj,
   // tabs. crbug.com/684661
   metrics_helper_ = base::MakeUnique<VrMetricsHelper>(main_contents_);
   metrics_helper_->SetVRActive(true);
-  metrics_helper_->SetWebVREnabled(
-      html_interface_->GetMode() == UiInterface::Mode::WEB_VR);
+  metrics_helper_->SetWebVREnabled(webvr_mode_);
 }
 
 void VrShell::LoadUIContent(JNIEnv* env, const JavaParamRef<jobject>& obj) {
@@ -174,6 +173,23 @@ void VrShell::PostToGlThreadWhenReady(const base::Closure& task) {
   gl_thread_->task_runner()->PostTask(FROM_HERE, task);
 }
 
+void VrShell::SetContentPaused(bool paused) {
+  if (content_paused_ == paused)
+    return;
+  content_paused_ = paused;
+
+  if (!delegate_provider_->device_provider())
+    return;
+
+  // TODO(mthiesse): The page is no longer visible when in menu mode. We
+  // should unfocus or otherwise let it know it's hidden.
+  if (paused) {
+    delegate_provider_->device_provider()->Device()->OnBlur();
+  } else {
+    delegate_provider_->device_provider()->Device()->OnFocus();
+  }
+}
+
 void VrShell::OnTriggerEvent(JNIEnv* env,
                              const JavaParamRef<jobject>& obj) {
   gl_thread_->task_runner()->PostTask(
@@ -227,14 +243,12 @@ void VrShell::OnDomContentsLoaded() {
 void VrShell::SetWebVrMode(JNIEnv* env,
                            const base::android::JavaParamRef<jobject>& obj,
                            bool enabled) {
+  webvr_mode_ = enabled;
   metrics_helper_->SetWebVREnabled(enabled);
   PostToGlThreadWhenReady(base::Bind(&VrShellGl::SetWebVrMode,
                                      gl_thread_->GetVrShellGl(), enabled));
-  if (enabled) {
-    html_interface_->SetMode(UiInterface::Mode::WEB_VR);
-  } else {
-    html_interface_->SetMode(UiInterface::Mode::STANDARD);
-  }
+  html_interface_->SetMode(
+      enabled ? UiInterface::Mode::WEB_VR : UiInterface::Mode::STANDARD);
 }
 
 void VrShell::OnLoadProgressChanged(JNIEnv* env,
@@ -321,19 +335,7 @@ void VrShell::GvrDelegateReady() {
 
 void VrShell::AppButtonPressed() {
 #if defined(ENABLE_VR_SHELL)
-  html_interface_->SetMenuMode(!html_interface_->GetMenuMode());
-
-  // TODO(mthiesse): The page is no longer visible when in menu mode. We
-  // should unfocus or otherwise let it know it's hidden.
-  if (html_interface_->GetMode() == UiInterface::Mode::WEB_VR) {
-    if (delegate_provider_->device_provider()) {
-      if (html_interface_->GetMenuMode()) {
-        delegate_provider_->device_provider()->Device()->OnBlur();
-      } else {
-        delegate_provider_->device_provider()->Device()->OnFocus();
-      }
-    }
-  }
+  html_interface_->HandleAppButtonClicked();
 #endif
 }
 
@@ -399,6 +401,12 @@ void VrShell::DoUiAction(const UiAction action,
     case OMNIBOX_CONTENT:
       html_interface_->HandleOmniboxInput(*arguments);
       break;
+    case SET_CONTENT_PAUSED: {
+      bool paused;
+      CHECK(arguments->GetBoolean("paused", &paused));
+      SetContentPaused(paused);
+      break;
+    }
 #if defined(ENABLE_VR_SHELL_UI_DEV)
     case RELOAD_UI:
       ui_contents_->GetController().Reload(content::ReloadType::NORMAL, false);

chrome/browser/android/vr_shell/vr_shell.h

@@ -55,6 +55,7 @@ enum UiAction {
   RELOAD_UI,
   LOAD_URL,
   OMNIBOX_CONTENT,
+  SET_CONTENT_PAUSED,
 };
 
 class VrMetricsHelper;
@@ -156,6 +157,7 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
  private:
   ~VrShell() override;
   void PostToGlThreadWhenReady(const base::Closure& task);
+  void SetContentPaused(bool paused);
 
   // content::WebContentsObserver implementation.
   void RenderViewHostChanged(content::RenderViewHost* old_host,
@@ -182,6 +184,8 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
   void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito);
 
   std::unique_ptr<UiInterface> html_interface_;
+  bool content_paused_ = false;
+  bool webvr_mode_ = false;
 
   content::WebContents* main_contents_;
   std::unique_ptr<VrCompositor> content_compositor_;

chrome/browser/resources/vr_shell/vr_shell_ui.js

@@ -573,27 +573,37 @@ var vrShellUi = (function() {
       this.reloadUiButton = new ReloadUiButton();
     }
 
-    setMode(mode, menuMode, fullscreen) {
-      /** @const */ var URL_INDICATOR_VISIBILITY_TIMEOUT_MS = 5000;
-
+    setMode(mode, fullscreen) {
       this.mode = mode;
-      this.menuMode = menuMode;
       this.fullscreen = fullscreen;
+      this.updateState();
+    }
+
+    handleAppButtonClicked() {
+      this.menuMode = !this.menuMode;
+      this.updateState();
+    }
+
+    updateState() {
+      /** @const */ var URL_INDICATOR_VISIBILITY_TIMEOUT_MS = 5000;
+
+      let mode = this.mode;
+      let menuMode = this.menuMode;
+
+      api.doAction(api.Action.SET_CONTENT_PAUSED, {'paused': menuMode});
 
-      this.reloadUiButton.setEnabled(mode == api.Mode.STANDARD);
       this.contentQuad.setEnabled(mode == api.Mode.STANDARD && !menuMode);
-      this.contentQuad.setFullscreen(fullscreen);
+      this.contentQuad.setFullscreen(this.fullscreen);
       // TODO(crbug/643815): Set aspect ratio on content quad when available.
-      // TODO(amp): Don't show controls in fullscreen once MENU mode lands.
-      this.controls.setEnabled(mode == api.Mode.STANDARD && !menuMode);
+      this.controls.setEnabled(menuMode);
+      this.omnibox.setEnabled(menuMode);
       this.urlIndicator.setEnabled(mode == api.Mode.STANDARD && !menuMode);
-      // TODO(amp): Don't show controls in CINEMA mode once MENU mode lands.
       this.urlIndicator.setVisibilityTimeout(
-          mode == api.Mode.STANDARD && !menuMode ?
-              0 :
-              URL_INDICATOR_VISIBILITY_TIMEOUT_MS);
-      this.omnibox.setEnabled(false);
-      this.secureOriginWarnings.setEnabled(mode == api.Mode.WEB_VR);
+          URL_INDICATOR_VISIBILITY_TIMEOUT_MS);
+      this.secureOriginWarnings.setEnabled(
+          mode == api.Mode.WEB_VR && !menuMode);
+
+      this.reloadUiButton.setEnabled(mode == api.Mode.STANDARD);
 
       api.setUiCssSize(
           uiRootElement.clientWidth, uiRootElement.clientHeight, UI_DPR);
@@ -617,7 +627,10 @@ var vrShellUi = (function() {
 
   function command(dict) {
     if ('mode' in dict) {
-      uiManager.setMode(dict['mode'], dict['menuMode'], dict['fullscreen']);
+      uiManager.setMode(dict['mode'], dict['fullscreen']);
+    }
+    if ('appButtonClicked' in dict) {
+      uiManager.handleAppButtonClicked();
     }
     if ('securityLevel' in dict) {
       uiManager.setSecurityLevel(dict['securityLevel']);

chrome/browser/resources/vr_shell/vr_shell_ui_api.js

@@ -68,6 +68,7 @@ api.Action = {
   'RELOAD_UI': 5,
   'LOAD_URL': 6,
   'OMNIBOX_CONTENT': 7,
+  'SET_CONTENT_PAUSED': 8,
 };
 
 /**