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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_view.cc

Issue 1492423003: Rejigger ThemeService: move exposure of ThemeProvider interface to a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: respond to comments 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_view.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index 2218f483d4df33407b264dd4225a8cdd83ee6f67..ee593d5b4a7ee088122bd21884c077c38f8f12c2 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -165,8 +165,9 @@ ToolbarView::~ToolbarView() {
void ToolbarView::Init() {
GetWidget()->AddObserver(this);
- back_ = new BackButton(this, new BackForwardMenuModel(
- browser_, BackForwardMenuModel::BACKWARD_MENU));
+ back_ = new BackButton(
+ browser_->profile(), this,
+ new BackForwardMenuModel(browser_, BackForwardMenuModel::BACKWARD_MENU));
back_->set_triggerable_event_flags(
ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
back_->set_tag(IDC_BACK);
@@ -175,8 +176,9 @@ void ToolbarView::Init() {
back_->set_id(VIEW_ID_BACK_BUTTON);
back_->Init();
- forward_ = new ToolbarButton(this, new BackForwardMenuModel(
- browser_, BackForwardMenuModel::FORWARD_MENU));
+ forward_ = new ToolbarButton(
+ browser_->profile(), this,
+ new BackForwardMenuModel(browser_, BackForwardMenuModel::FORWARD_MENU));
forward_->set_triggerable_event_flags(
ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
forward_->set_tag(IDC_FORWARD);
@@ -190,7 +192,8 @@ void ToolbarView::Init() {
browser_->command_controller()->command_updater(), this,
display_mode_ == DISPLAYMODE_LOCATION);
- reload_ = new ReloadButton(browser_->command_controller()->command_updater());
+ reload_ = new ReloadButton(browser_->profile(),
+ browser_->command_controller()->command_updater());
reload_->set_triggerable_event_flags(
ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
reload_->set_tag(IDC_RELOAD);

Powered by Google App Engine
This is Rietveld 408576698