diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-13 21:54:13 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-13 21:54:13 +0000 |
| commit | 2bcccf4e51bfb7ea6ede5ba067051e89182ec167 (patch) | |
| tree | b3bc554202decd9ce4e6cf60e08e470a3e2fd534 /chrome/browser/gtk/browser_titlebar.cc | |
| parent | 54b2c7a7ff4346537d4b83b532890fb0094b9686 (diff) | |
| download | chromium_src-2bcccf4e51bfb7ea6ede5ba067051e89182ec167.zip chromium_src-2bcccf4e51bfb7ea6ede5ba067051e89182ec167.tar.gz chromium_src-2bcccf4e51bfb7ea6ede5ba067051e89182ec167.tar.bz2 | |
linux: Update how menu icons are assigned.
Slightly change the architecture of how icons are assigned to menu items. Also,
add stock icons for some additional menu items. And always show icons on
overflow menus.
BUG=59101
TEST=The major change here is architectural change, so there is little visible
change in functionality. But if you right click on a link, it should now show
an icon for the 'Open in new tab' menu.
patch by sadrul@chromium.org
original review: http://codereview.chromium.org/3714003/show
Review URL: http://codereview.chromium.org/3816002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_titlebar.cc')
| -rw-r--r-- | chrome/browser/gtk/browser_titlebar.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc index 5074e5d..9556ae6 100644 --- a/chrome/browser/gtk/browser_titlebar.cc +++ b/chrome/browser/gtk/browser_titlebar.cc @@ -656,7 +656,7 @@ void BrowserTitlebar::ShowFaviconMenu(GdkEventButton* event) { favicon_menu_model_.reset( new PopupPageMenuModel(this, browser_window_->browser())); - favicon_menu_.reset(new MenuGtk(this, favicon_menu_model_.get())); + favicon_menu_.reset(new MenuGtk(NULL, favicon_menu_model_.get())); } favicon_menu_->Popup(app_mode_favicon_, reinterpret_cast<GdkEvent*>(event)); @@ -749,7 +749,7 @@ gboolean BrowserTitlebar::OnButtonPressed(GtkWidget* widget, void BrowserTitlebar::ShowContextMenu() { if (!context_menu_.get()) { context_menu_model_.reset(new ContextMenuModel(this)); - context_menu_.reset(new MenuGtk(this, context_menu_model_.get())); + context_menu_.reset(new MenuGtk(NULL, context_menu_model_.get())); } context_menu_->PopupAsContext(gtk_get_current_event_time()); |