Omnibox app

mandoline/ui/browser/desktop/desktop_ui.h

Index: mandoline/ui/browser/desktop/desktop_ui.h
diff --git a/mandoline/ui/browser/desktop/desktop_ui.h b/mandoline/ui/browser/desktop/desktop_ui.h
index c3167b0d1bc37a83b974d25c20104c4257615ed3..3ff608cc6f987653d5dc3f4b2af0d67eab6c26ec 100644
--- a/mandoline/ui/browser/desktop/desktop_ui.h
+++ b/mandoline/ui/browser/desktop/desktop_ui.h
@@ -7,7 +7,8 @@
 
 #include "mandoline/ui/aura/aura_init.h"
 #include "mandoline/ui/browser/browser_ui.h"
-#include "ui/views/controls/textfield/textfield_controller.h"
+#include "mandoline/ui/browser/omnibox.mojom.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/layout/layout_manager.h"
 
 namespace mojo {
@@ -15,35 +16,41 @@ class Shell;
 class View;
 }
 
+namespace views {
+class LabelButton;
+}
+
 namespace mandoline {
 
 class Browser;
 
 class DesktopUI : public BrowserUI,
                   public views::LayoutManager,
-                  public views::TextfieldController {
+                  public views::ButtonListener {
  public:
-  DesktopUI(Browser* browser, mojo::Shell* shell);
+  DesktopUI(Browser* browser, mojo::ApplicationImpl* application_impl);
   ~DesktopUI() override;
 
  private:
   // Overridden from BrowserUI
-  void Init(mojo::View* root, mojo::View* content) override;
+  void Init(mojo::View* root) override;
+  void OnURLChanged() override;
 
   // Overridden from views::LayoutManager:
   gfx::Size GetPreferredSize(const views::View* view) const override;
   void Layout(views::View* host) override;
 
-  // Overridden from views::TextfieldController:
-  bool HandleKeyEvent(views::Textfield* sender,
-                      const ui::KeyEvent& key_event) override;
+  // Overridden from views::ButtonListener:
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   AuraInit aura_init_;
   Browser* browser_;
-  mojo::Shell* shell_;
-  views::Textfield* omnibox_;
+  mojo::ApplicationImpl* application_impl_;
+  views::LabelButton* omnibox_launcher_;
   mojo::View* root_;
   mojo::View* content_;
+  OmniboxPtr omnibox_;
+  mojo::Binding<OmniboxClient> client_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopUI);
 };