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

chrome/browser/cocoa/wrench_menu_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_WRENCH_MENU_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_WRENCH_MENU_CONTROLLER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 
@@ skipping 22 matching lines @@
   IBOutlet NSButton* editCut_;
   IBOutlet NSButton* editCopy_;
   IBOutlet NSButton* editPaste_;
 
   IBOutlet MenuTrackedRootView* zoomItem_;
   IBOutlet NSButton* zoomPlus_;
   IBOutlet NSButton* zoomDisplay_;
   IBOutlet NSButton* zoomMinus_;
   IBOutlet NSButton* zoomFullScreen_;
 
+  WrenchMenuModel* wrench_model_;

[Robert Sesek, 2010/08/24 00:31:13]

Unnecessary.  The MenuController already maintains a weak reference to the
MenuModel and there's an accessor that casts it to the WMM.  Remove.

[Robert Sesek, 2010/08/24 15:28:07]

Name this wrenchMenuModel_ and add a comment as to how/why this differs from the
super's model_ member.

+
   scoped_ptr<WrenchMenuControllerInternal::ZoomLevelObserver> observer_;
 }
 

[Robert Sesek, 2010/08/24 15:28:07]

Add: @property (nonatomic, assign) WrenchMenuModel* wrenchMenuModel;

 // Designated initializer; called within the NIB.
 - (id)init;
 
+- (void)setWrenchMenuModel:(WrenchMenuModel*)model;

[Robert Sesek, 2010/08/24 00:31:13]

Remove.

[Robert Sesek, 2010/08/24 15:28:07]

Still remove this proto.

+
 // Used to dispatch commands from the Wrench menu. The custom items within the
 // menu cannot be hooked up directly to First Responder because the window in
 // which the controls reside is not the BrowserWindowController, but a
 // NSCarbonMenuWindow; this screws up the typical |-commandDispatch:| system.
 - (IBAction)dispatchWrenchMenuCommand:(id)sender;
 
 // Returns the weak reference to the WrenchMenuModel.
 - (WrenchMenuModel*)wrenchMenuModel;
 
-// Inserts the update available notification menu item.
-- (void)insertUpdateAvailableItem;
-
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
 
 @interface WrenchMenuController (UnitTesting)
 // |-dispatchWrenchMenuCommand:| calls this after it has determined the tag of
 // the sender. The default implementation executes the command on the outermost
 // run loop using |-performSelector...withDelay:|. This is not desirable in
 // unit tests because it's hard to test around run loops in a deterministic
 // manner. To avoid those headaches, tests should provide an alternative
 // implementation.
 - (void)dispatchCommandInternal:(NSInteger)tag;
 @end
 
 #endif  // CHROME_BROWSER_COCOA_WRENCH_MENU_CONTROLLER_H_