mandoline: Add back/forward support and UI.

mandoline/ui/desktop_ui/browser_window.h

Index: mandoline/ui/desktop_ui/browser_window.h
diff --git a/mandoline/ui/desktop_ui/browser_window.h b/mandoline/ui/desktop_ui/browser_window.h
index 85b1f33236dbe695f824b754ddd46825e6c0ba1c..c2ff8de53cc68c5be6f6cbb8778c46663eaec337 100644
--- a/mandoline/ui/desktop_ui/browser_window.h
+++ b/mandoline/ui/desktop_ui/browser_window.h
@@ -15,7 +15,6 @@
 #include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h"
 #include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/layout/layout_manager.h"
 #include "url/gurl.h"
 
@@ -25,22 +24,18 @@ class Shell;
 class View;
 }
 
-namespace views {
-class LabelButton;
-}
-
 namespace mandoline {
 
 class BrowserManager;
 class ProgressView;
+class ToolbarView;
 
 class BrowserWindow : public mojo::ViewTreeDelegate,
                       public mojo::ViewTreeHostClient,
                       public web_view::mojom::WebViewClient,
                       public ViewEmbedder,
                       public mojo::InterfaceFactory<ViewEmbedder>,
-                      public views::LayoutManager,
-                      public views::ButtonListener {
+                      public views::LayoutManager {
  public:
   BrowserWindow(mojo::ApplicationImpl* app,
                 mojo::ViewTreeHostFactory* host_factory,
@@ -49,6 +44,10 @@ class BrowserWindow : public mojo::ViewTreeDelegate,
   void LoadURL(const GURL& url);
   void Close();
 
+  void ShowOmnibox();
+  void GoBack();
+  void GoForward();
+
  private:
   ~BrowserWindow() override;
 
@@ -65,6 +64,8 @@ class BrowserWindow : public mojo::ViewTreeDelegate,
   void TopLevelNavigate(mojo::URLRequestPtr request) override;
   void LoadingStateChanged(bool is_loading) override;
   void ProgressChanged(double progress) override;
+  void BackForwardChanged(web_view::mojom::ButtonState back_button,
+                          web_view::mojom::ButtonState forward_button) override;
   void TitleChanged(const mojo::String& title) override;
 
   // Overridden from ViewEmbedder:
@@ -79,11 +80,7 @@ class BrowserWindow : public mojo::ViewTreeDelegate,
   gfx::Size GetPreferredSize(const views::View* view) const override;
   void Layout(views::View* host) override;
 
-  // Overridden from views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   void Init(mojo::View* root);
-  void ShowOmnibox();
   void EmbedOmnibox();
 
   mojo::ApplicationImpl* app_;
@@ -91,7 +88,7 @@ class BrowserWindow : public mojo::ViewTreeDelegate,
   mojo::ViewTreeHostPtr host_;
   mojo::Binding<ViewTreeHostClient> host_client_binding_;
   BrowserManager* manager_;
-  views::LabelButton* omnibox_launcher_;
+  ToolbarView* toolbar_view_;
   ProgressView* progress_bar_;
   mojo::View* root_;
   mojo::View* content_;