| 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);
|
|
|
|
|