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

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

Issue 126092: Begin to upgrade BackForwardMenuModelViews to use new menu API.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 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: chrome/browser/views/toolbar_view.cc
===================================================================
--- chrome/browser/views/toolbar_view.cc (revision 18347)
+++ chrome/browser/views/toolbar_view.cc (working copy)
@@ -179,10 +179,6 @@
browser_->command_updater()->AddCommandObserver(IDC_RELOAD, this);
browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
browser_->command_updater()->AddCommandObserver(IDC_STAR, this);
- back_menu_model_.reset(new BackForwardMenuModelViews(
- browser, BackForwardMenuModel::BACKWARD_MENU_DELEGATE));
- forward_menu_model_.reset(new BackForwardMenuModelViews(
- browser, BackForwardMenuModel::FORWARD_MENU_DELEGATE));
if (browser->type() == Browser::TYPE_NORMAL)
display_mode_ = DISPLAYMODE_NORMAL;
else
@@ -199,6 +195,11 @@
}
void ToolbarView::Init(Profile* profile) {
+ back_menu_model_.reset(new BackForwardMenuModelViews(
+ browser_, BackForwardMenuModel::BACKWARD_MENU, GetWidget()));
+ forward_menu_model_.reset(new BackForwardMenuModelViews(
+ browser_, BackForwardMenuModel::FORWARD_MENU, GetWidget()));
+
// Create all the individual Views in the Toolbar.
CreateLeftSideControls();
CreateCenterStack(profile);

Powered by Google App Engine
This is Rietveld 408576698