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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_button.h

Issue 1492423003: Rejigger ThemeService: move exposure of ThemeProvider interface to a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix that unittest Created 5 years 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: chrome/browser/ui/views/toolbar/toolbar_button.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h
index 9526915aa226e7ac4a048f9127499bd26cb4288f..ca55dbac6e935626207d0160327b15844446a671 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -12,6 +12,8 @@
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/button/label_button.h"
+class Profile;
+
namespace ui {
class MenuModel;
}
@@ -29,7 +31,9 @@ class ToolbarButton : public views::LabelButton,
public:
// Takes ownership of the |model|, which can be null if no menu
// is to be shown.
- ToolbarButton(views::ButtonListener* listener, ui::MenuModel* model);
+ ToolbarButton(Profile* profile,
+ views::ButtonListener* listener,
+ ui::MenuModel* model);
~ToolbarButton() override;
// Set up basic mouseover border behavior.
@@ -85,6 +89,9 @@ class ToolbarButton : public views::LabelButton,
// views::InkDropHost:
gfx::Point CalculateInkDropCenter() const override;
+ // The associated profile. The browser theme affects rendering.
+ Profile* profile_;
+
// The model that populates the attached menu.
scoped_ptr<ui::MenuModel> model_;
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698