diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 22:49:58 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 22:49:58 +0000 |
| commit | 0f28580a84220d218288bfdec6bb689b2e1b8d29 (patch) | |
| tree | 2034a137103f04f513b6ab0d4cc3cbb13ccdd30f /chrome/browser/gtk/browser_actions_toolbar_gtk.cc | |
| parent | 4a4d141960653d52e80b52c92358b6f19fc21b1b (diff) | |
| download | chromium_src-0f28580a84220d218288bfdec6bb689b2e1b8d29.zip chromium_src-0f28580a84220d218288bfdec6bb689b2e1b8d29.tar.gz chromium_src-0f28580a84220d218288bfdec6bb689b2e1b8d29.tar.bz2 | |
GTK: make tab context menu use tab_menu_model
flesh out some more menu model implementation for MenuGtk
BUG=28977
TEST=menu still works as before
Review URL: http://codereview.chromium.org/523049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_actions_toolbar_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/browser_actions_toolbar_gtk.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc index cc43f3e..4da93f9 100644 --- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc @@ -51,8 +51,7 @@ GtkTargetEntry GetDragTargetEntry() { } // namespace class BrowserActionButton : public NotificationObserver, - public ImageLoadingTracker::Observer, - public MenuGtk::Delegate { + public ImageLoadingTracker::Observer { public: BrowserActionButton(BrowserActionsToolbarGtk* toolbar, Extension* extension) @@ -182,7 +181,7 @@ class BrowserActionButton : public NotificationObserver, } action->context_menu_.reset( - new MenuGtk(action, action->context_menu_model_.get())); + new MenuGtk(NULL, action->context_menu_model_.get())); action->context_menu_->Popup(widget, event); return TRUE; |