Revert "Clean up the WrenchMenuModel so that it uses SimpleMenu::Delegate."

chrome/browser/views/toolbar_view.h

Index: chrome/browser/views/toolbar_view.h
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index 08550c0717eddbd6bd25b2329e3fae94d5cc6e0a..af73d607b4995c12378f4c185bb14b04023bbc4c 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "app/menus/accelerator.h"
+#include "app/menus/simple_menu_model.h"
 #include "app/slide_animation.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/back_forward_menu_model.h"
@@ -27,12 +27,11 @@ class BrowserActionsContainer;
 class Browser;
 class Profile;
 class WrenchMenu;
-class WrenchMenuModel;
 
 // The Browser Window's toolbar.
 class ToolbarView : public AccessibleToolbarView,
                     public views::ViewMenuDelegate,
-                    public menus::AcceleratorProvider,
+                    public menus::SimpleMenuModel::Delegate,
                     public LocationBarView::Delegate,
                     public AnimationDelegate,
                     public NotificationObserver,
@@ -105,9 +104,12 @@ class ToolbarView : public AccessibleToolbarView,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // Overridden from menus::AcceleratorProvider:
+  // Overridden from menus::SimpleMenuModel::Delegate:
+  virtual bool IsCommandIdChecked(int command_id) const;
+  virtual bool IsCommandIdEnabled(int command_id) const;
   virtual bool GetAcceleratorForCommandId(int command_id,
                                           menus::Accelerator* accelerator);
+  virtual void ExecuteCommand(int command_id);
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize();
@@ -183,7 +185,7 @@ class ToolbarView : public AccessibleToolbarView,
   DisplayMode display_mode_;
 
   // The contents of the app menu.
-  scoped_ptr<WrenchMenuModel> wrench_menu_model_;
+  scoped_ptr<menus::SimpleMenuModel> app_menu_model_;
 
   // Wrench menu.
   scoped_ptr<WrenchMenu> wrench_menu_;