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

Unified Diff: chrome/browser/gtk/browser_toolbar_gtk.h

Issue 3163023: Clean up the WrenchMenuModel so that it uses SimpleMenu::Delegate. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fix stray rb Created 10 years, 4 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/gtk/browser_toolbar_gtk.h
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h
index 09f04f13920c361359b67b686133915da8c0fefa..1018dc0258eaefcde8951beba86ff74b25cc5b14 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.h
+++ b/chrome/browser/gtk/browser_toolbar_gtk.h
@@ -12,6 +12,7 @@
#include "app/active_window_watcher_x.h"
#include "app/gtk_signal.h"
#include "app/gtk_signal_registrar.h"
+#include "app/menus/accelerator.h"
#include "app/menus/simple_menu_model.h"
#include "app/throb_animation.h"
#include "base/scoped_ptr.h"
@@ -40,7 +41,7 @@ class ToolbarModel;
// View class that displays the GTK version of the toolbar and routes gtk
// events back to the Browser.
class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
- public menus::SimpleMenuModel::Delegate,
+ public menus::AcceleratorProvider,
public MenuGtk::Delegate,
public NotificationObserver,
public AnimationDelegate,
@@ -94,10 +95,7 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
virtual void StoppedShowing();
virtual GtkIconSet* GetIconSetForId(int idr);
- // Overridden from menus::SimpleMenuModel::Delegate:
- virtual bool IsCommandIdEnabled(int id) const;
- virtual bool IsCommandIdChecked(int id) const;
- virtual void ExecuteCommand(int id);
+ // Overridden from menus::AcceleratorProvider:
virtual bool GetAcceleratorForCommandId(int id,
menus::Accelerator* accelerator);

Powered by Google App Engine
This is Rietveld 408576698