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

chrome/browser/cocoa/toolbar_controller.mm

 // 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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 77 matching lines @@
 - (void)adjustBrowserActionsContainerForNewWindow:(NSNotification*)notification;
 - (void)browserActionsContainerDragged:(NSNotification*)notification;
 - (void)browserActionsContainerDragFinished:(NSNotification*)notification;
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification;
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate;
 - (void)badgeWrenchMenu;
 @end
 
 namespace ToolbarControllerInternal {
 
-// A C++ delegate that handles enabling/disabling menu items and handling when
-// a menu command is chosen.
-class MenuDelegate : public menus::SimpleMenuModel::Delegate {
+// A C++ delegate that handles the accelerators in the wrench menu.
+class WrenchAcceleratorDelegate : public menus::AcceleratorProvider {
  public:
-  explicit MenuDelegate(Browser* browser)
-      : browser_(browser) { }
-
-  // Overridden from menus::SimpleMenuModel::Delegate
-  virtual bool IsCommandIdChecked(int command_id) const {
-    if (command_id == IDC_SHOW_BOOKMARK_BAR) {
-      return browser_->profile()->GetPrefs()->GetBoolean(
-          prefs::kShowBookmarkBar);
-    }
-    return false;
-  }
-  virtual bool IsCommandIdEnabled(int command_id) const {
-    return browser_->command_updater()->IsCommandEnabled(command_id);
-  }
   virtual bool GetAcceleratorForCommandId(int command_id,
       menus::Accelerator* accelerator_generic) {
     // Downcast so that when the copy constructor is invoked below, the key
     // string gets copied, too.
     menus::AcceleratorCocoa* out_accelerator =
         static_cast<menus::AcceleratorCocoa*>(accelerator_generic);
     AcceleratorsCocoa* keymap = Singleton<AcceleratorsCocoa>::get();
     const menus::AcceleratorCocoa* accelerator =
         keymap->GetAcceleratorForCommand(command_id);
     if (accelerator) {
       *out_accelerator = *accelerator;
       return true;
     }
     return false;
   }
-  virtual void ExecuteCommand(int command_id) {
-    browser_->ExecuteCommand(command_id);
-  }
-  virtual bool IsLabelForCommandIdDynamic(int command_id) const {
-    // On Mac, switch between "Enter Full Screen" and "Exit Full Screen".
-    return (command_id == IDC_FULLSCREEN);
-  }
-  virtual string16 GetLabelForCommandId(int command_id) const {
-    if (command_id == IDC_FULLSCREEN) {
-      int string_id = IDS_ENTER_FULLSCREEN_MAC;  // Default to Enter.
-      // Note: On startup, |window()| may be NULL.
-      if (browser_->window() && browser_->window()->IsFullscreen())
-        string_id = IDS_EXIT_FULLSCREEN_MAC;
-      return l10n_util::GetStringUTF16(string_id);
-    }
-    return menus::SimpleMenuModel::Delegate::GetLabelForCommandId(command_id);
-  }
-
- private:
-  Browser* browser_;
 };
 
 // A class registered for C++ notifications. This is used to detect changes in
 // preferences and upgrade available notifications. Bridges the notification
 // back to the ToolbarController.
 class NotificationBridge : public NotificationObserver {
  public:
   explicit NotificationBridge(ToolbarController* controller)
       : controller_(controller) {
     registrar_.Add(this, NotificationType::UPGRADE_RECOMMENDED,
@@ skipping 379 matching lines @@
   [locationBar_ setFrame:[self adjustRect:[locationBar_ frame]
                                  byAmount:moveX]];
   [homeButton_ setHidden:hide];
 }
 
 // Install the menu wrench buttons. Calling this repeatedly is inexpensive so it
 // can be done every time the buttons are shown.
 - (void)installWrenchMenu {
   if (wrenchMenuModel_.get())
     return;
-  menuDelegate_.reset(new ToolbarControllerInternal::MenuDelegate(browser_));
+  acceleratorDelegate_.reset(
+      new ToolbarControllerInternal::WrenchAcceleratorDelegate());
 
-  wrenchMenuModel_.reset(new WrenchMenuModel(menuDelegate_.get(), browser_));
-  [wrenchMenuController_ setModel:wrenchMenuModel_.get()];
+  wrenchMenuModel_.reset(new WrenchMenuModel(
+      acceleratorDelegate_.get(), browser_));
+  [wrenchMenuController_ setWrenchMenuModel:wrenchMenuModel_.get()];
   [wrenchMenuController_ setUseWithPopUpButtonCell:YES];
   [wrenchButton_ setAttachedMenu:[wrenchMenuController_ menu]];
 }
 
 - (WrenchMenuController*)wrenchMenuController {
   return wrenchMenuController_;
 }
 
 - (void)badgeWrenchMenu {
   // In the Windows version, the ball doesn't actually pulsate, and is always
   // drawn with the inactive image. Why? (We follow suit, though not on the
   // weird positioning they do that overlaps the button border.)
   NSImage* badge = nsimage_cache::ImageNamed(@"upgrade_dot.pdf");
   NSImage* wrenchImage = nsimage_cache::ImageNamed(kWrenchButtonImageName);
   NSSize wrenchImageSize = [wrenchImage size];
 
   scoped_nsobject<NSImage> overlayImage(
       [[NSImage alloc] initWithSize:wrenchImageSize]);
 
   [overlayImage lockFocus];
   [badge drawAtPoint:NSZeroPoint
             fromRect:NSZeroRect
            operation:NSCompositeSourceOver
             fraction:1.0];
   [overlayImage unlockFocus];
 
   [[wrenchButton_ cell] setOverlayImage:overlayImage];
-
-  [wrenchMenuController_ insertUpdateAvailableItem];

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

Removing this concerns me.  Does this break the update available notification in
the menu?  I think it will; see later comments as to why.

 }
 
 - (void)prefChanged:(std::string*)prefName {
   if (!prefName) return;
   if (*prefName == prefs::kShowHomeButton) {
     [self showOptionalHomeButton];
   }
 }
 
 - (void)createBrowserActionButtons {
@@ skipping 200 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end