Clean up VR Shell mode transitions (and fix potential webvr startup race).

chrome/browser/android/vr_shell/ui_interface.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/ui_interface.h"
 
 #include "chrome/browser/ui/webui/vr_shell/vr_shell_ui_message_handler.h"
 #include "url/gurl.h"
 
 namespace vr_shell {
 
-UiInterface::UiInterface() {
-  SetMode(Mode::STANDARD);
+UiInterface::UiInterface(Mode initial_mode) {
+  SetMode(initial_mode);
 }
 
 UiInterface::~UiInterface() {}
 
 void UiInterface::SetMode(Mode mode) {
   mode_ = mode;
-  updates_.SetInteger("mode", static_cast<int>(mode));
+  FlushModeState();
+}
+
+void UiInterface::SetMenuMode(bool enabled) {
+  menu_mode_ = enabled;
+  FlushModeState();
+}
+
+void UiInterface::SetCinemaMode(bool enabled) {
+  cinema_mode_ = enabled;
+  FlushModeState();
+}
+
+void UiInterface::FlushModeState() {
+  updates_.SetInteger("mode", static_cast<int>(mode_));
+  updates_.SetBoolean("menuMode", menu_mode_);
+  updates_.SetBoolean("cinemaMode", cinema_mode_);
   FlushUpdates();
 }
 
 void UiInterface::SetSecureOrigin(bool secure) {
   updates_.SetBoolean("secureOrigin", secure);
   FlushUpdates();
 }
 
 void UiInterface::SetLoading(bool loading) {
   updates_.SetBoolean("loading", loading);
@@ skipping 22 matching lines @@
 }
 
 void UiInterface::FlushUpdates() {
   if (loaded_ && handler_) {
     handler_->SendCommandToUi(updates_);
     updates_.Clear();
   }
 }
 
 }  // namespace vr_shell