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

chrome/browser/cocoa/toolbar_controller.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 
@@ skipping 10 matching lines @@
 @class BrowserActionsContainerView;
 @class BackForwardMenuController;
 class Browser;
 @class BrowserActionsController;
 class CommandUpdater;
 @class DelayedMenuButton;
 class LocationBar;
 class LocationBarViewMac;
 @class MenuButton;
 namespace ToolbarControllerInternal {
-class WrenchAcceleratorDelegate;
+class MenuDelegate;
 class NotificationBridge;
 }  // namespace ToolbarControllerInternal
 class Profile;
 @class ReloadButton;
 class TabContents;
 class ToolbarModel;
 @class WrenchMenuController;
 class WrenchMenuModel;
 
 // A controller for the toolbar in the browser window. Manages
@@ skipping 25 matching lines @@
   scoped_ptr<LocationBarViewMac> locationBarView_;
   scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_;
   id<ViewResizer> resizeDelegate_;  // weak
   scoped_nsobject<BackForwardMenuController> backMenuController_;
   scoped_nsobject<BackForwardMenuController> forwardMenuController_;
   scoped_nsobject<BrowserActionsController> browserActionsController_;
 
   // Lazily-instantiated model and delegate for the menu on the
   // wrench button.  Once visible, it will be non-null, but will not
   // reaped when the menu is hidden once it is initially shown.
-  scoped_ptr<ToolbarControllerInternal::WrenchAcceleratorDelegate>
-      acceleratorDelegate_;
+  scoped_ptr<ToolbarControllerInternal::MenuDelegate> menuDelegate_;
   scoped_ptr<WrenchMenuModel> wrenchMenuModel_;
 
   // Used for monitoring the optional toolbar button prefs.
   scoped_ptr<ToolbarControllerInternal::NotificationBridge> notificationBridge_;
   BooleanPrefMember showHomeButton_;
   BooleanPrefMember showPageOptionButtons_;
   BOOL hasToolbar_;  // If NO, we may have only the location bar.
   BOOL hasLocationBar_;  // If |hasToolbar_| is YES, this must also be YES.
   BOOL locationBarAtMinSize_; // If the location bar is at the minimum size.
 
@@ skipping 91 matching lines @@
 // Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews;
 - (void)showOptionalHomeButton;
 - (void)installWrenchMenu;
 - (WrenchMenuController*)wrenchMenuController;
 // Return a hover button for the current event.
 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_