NOT FOR REVIEW: A set of patches for Josh to work on top of.

chrome/browser/android/vr_shell/ui_interface.cc

Index: chrome/browser/android/vr_shell/ui_interface.cc
diff --git a/chrome/browser/android/vr_shell/ui_interface.cc b/chrome/browser/android/vr_shell/ui_interface.cc
index 6d021b5bf2f876a48614d679880901cc6fa95b7b..249ec2dc4f97ec0aca8d9934647a7e766e958abd 100644
--- a/chrome/browser/android/vr_shell/ui_interface.cc
+++ b/chrome/browser/android/vr_shell/ui_interface.cc
@@ -4,12 +4,18 @@
 
 #include "chrome/browser/android/vr_shell/ui_interface.h"
 
+#include <memory>
+#include <utility>
+
+#include "base/memory/ptr_util.h"
+#include "chrome/browser/android/vr_shell/vr_omnibox.h"
 #include "chrome/browser/ui/webui/vr_shell/vr_shell_ui_message_handler.h"
 #include "url/gurl.h"
 
 namespace vr_shell {
 
-UiInterface::UiInterface(Mode initial_mode, bool fullscreen) {
+UiInterface::UiInterface(Mode initial_mode, bool fullscreen)
+    : omnibox_(base::MakeUnique<VrOmnibox>(this)) {
   SetMode(initial_mode);
   SetFullscreen(fullscreen);
 }
@@ -21,19 +27,23 @@ void UiInterface::SetMode(Mode mode) {
   FlushModeState();
 }
 
-void UiInterface::SetMenuMode(bool enabled) {
-  menu_mode_ = enabled;
-  FlushModeState();
-}
-
 void UiInterface::SetFullscreen(bool enabled) {
   fullscreen_ = enabled;
   FlushModeState();
 }
 
+void UiInterface::HandleOmniboxInput(const base::DictionaryValue& input) {
+  omnibox_->HandleInput(input);
+}
+
+void UiInterface::SetOmniboxSuggestions(
+    std::unique_ptr<base::Value> suggestions) {
+  updates_.Set("suggestions", std::move(suggestions));
+  FlushUpdates();
+}
+
 void UiInterface::FlushModeState() {
   updates_.SetInteger("mode", static_cast<int>(mode_));
-  updates_.SetBoolean("menuMode", menu_mode_);
   updates_.SetBoolean("fullscreen", fullscreen_);
   FlushUpdates();
 }
@@ -67,6 +77,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)