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

Unified Diff: chrome/browser/ui/views/toolbar_view.h

Issue 11298004: alternate ntp: add "Recent Tabs" submenu to wrench menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased to resolve conflicts Created 8 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/views/wrench_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar_view.h
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index 4e6e244507d39ee9bccc9add71f306f5e744328c..0c35180a11fea4728acd48aac61a1fffa1eaa395 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -227,9 +227,11 @@ class ToolbarView : public views::AccessiblePaneView,
// The display mode used when laying out the toolbar.
DisplayMode display_mode_;
- // Wrench menu.
- scoped_ptr<WrenchMenu> wrench_menu_;
+ // Wrench model and menu.
+ // Note that the menu should be destroyed before the model it uses, so the
+ // menu should be listed later.
scoped_ptr<WrenchMenuModel> wrench_menu_model_;
+ scoped_ptr<WrenchMenu> wrench_menu_;
// A list of listeners to call when the menu opens.
ObserverList<views::MenuListener> menu_listeners_;
« no previous file with comments | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/views/wrench_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698