Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(766)

Unified Diff: mandoline/ui/desktop_ui/browser_window.h

Issue 1326443006: mandoline: Add back/forward support and UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comment Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 cbb61f54579c060555d749b9ee71afe0ff3b0b68..8bf421d95bdac72416cc0162b5ef1339c8676686 100644
--- a/mandoline/ui/desktop_ui/browser_window.h
+++ b/mandoline/ui/desktop_ui/browser_window.h
@@ -39,8 +39,7 @@ class BrowserWindow : public mojo::ViewTreeDelegate,
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,
@@ -50,6 +49,8 @@ class BrowserWindow : public mojo::ViewTreeDelegate,
void Close();
private:
+ class ToolbarView;
+
~BrowserWindow() override;
float DIPSToPixels(float value) const;
@@ -65,6 +66,7 @@ class BrowserWindow : public mojo::ViewTreeDelegate,
void TopLevelNavigate(mojo::URLRequestPtr request) override;
void LoadingStateChanged(bool is_loading) override;
void ProgressChanged(double progress) override;
+ void BackForwardChanged(bool back_enabled, bool forward_enabled) override;
void TitleChanged(const mojo::String& title) override;
// Overridden from ViewEmbedder:
@@ -79,11 +81,10 @@ 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 GoBack();
msw 2015/09/04 22:05:00 nit: Backward to match Forward
+ void GoForward();
void EmbedOmnibox();
mojo::ApplicationImpl* app_;
@@ -91,7 +92,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_;

Powered by Google App Engine
This is Rietveld 408576698