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

chrome/browser/cocoa/wrench_menu_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/wrench_menu_controller.h"
 
 #include "app/l10n_util.h"
 #include "app/menus/menu_model.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 36 matching lines @@
     [[controller_ zoomDisplay] setTitle:SysUTF16ToNSString(level)];
   }
 
  private:
   NotificationRegistrar registrar_;
   WrenchMenuController* controller_;  // Weak; owns this.
 };
 
 }  // namespace WrenchMenuControllerInternal
 
 @implementation WrenchMenuController

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

Add: @synthesize wrenchMenuModel = wrenchMenuModel_;

 
 - (id)init {
   if ((self = [super init])) {
     observer_.reset(new WrenchMenuControllerInternal::ZoomLevelObserver(self));
   }
   return self;
 }
 
+- (void)setWrenchMenuModel:(WrenchMenuModel*)model {

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

Remove.

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

Keep this.

+  wrench_model_ = model;
+  [self setModel:model->menu_model()];
+}
+
 - (void)addItemToMenu:(NSMenu*)menu
               atIndex:(NSInteger)index
             fromModel:(menus::MenuModel*)model
            modelIndex:(int)modelIndex {
   // Non-button item types should be built as normal items.
   menus::MenuModel::ItemType type = model->GetTypeAt(modelIndex);
   if (type != menus::MenuModel::TYPE_BUTTON_ITEM) {
     [super addItemToMenu:menu
                  atIndex:index
                fromModel:model
@@ skipping 82 matching lines @@
   [self performSelector:@selector(performCommandDispatch:)
              withObject:[NSNumber numberWithInt:tag]
              afterDelay:0.0];
 }
 
 // Used to perform the actual dispatch on the outermost runloop.
 - (void)performCommandDispatch:(NSNumber*)tag {
   [self wrenchMenuModel]->ExecuteCommand([tag intValue]);
 }
 
 - (WrenchMenuModel*)wrenchMenuModel {

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

Remove this (the compiler will generate it).

-  return static_cast<WrenchMenuModel*>(model_);
-}
-
-// Inserts the update available notification menu item.
-- (void)insertUpdateAvailableItem {

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

Cocoa's MenuController (and thus the WrenchMenuController) caches the NSMenu and
does not build it on-demand each time.  Therefore, unless it is explicitly
inserted (which it doesn't appear to be), it will never get added.  That was
http://crbug.com/50659.

And a note of warning: I ran into a Cocoa bug in which the custom views within
the Wrench menu cannot be reparented; the subviews all appear correct in the
debugger, but they do not draw for some reason.  This means that you cannot take
the custom view from one menu, remove them, and insert them as custom views into
a new menu.  Reparenting views will be necessary to get build-on-demand working.
 I do not think you can make this change.

-  WrenchMenuModel* model = [self wrenchMenuModel];
-  // Don't insert the item multiple times.
-  if (!model || model->GetIndexOfCommandId(IDC_ABOUT) != -1)
-    return;
-
-  // Update the model manually because the model is static because other
-  // platforms always have an About item.
-  int index = model->GetIndexOfCommandId(IDC_OPTIONS) + 1;
-  model->InsertItemAt(index, IDC_ABOUT,
-                      l10n_util::GetStringFUTF16(IDS_ABOUT,
-                          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
-
-  // The model does not broadcast change notifications to its delegate, so
-  // insert the actual menu item ourselves.
-  NSInteger menuIndex = [[self menu] indexOfItemWithTag:index];
-  [self addItemToMenu:[self menu]
-              atIndex:menuIndex
-            fromModel:model
-           modelIndex:index];
-
-  // Since the tag of each menu item is the index within the model, they need
-  // to be adjusted after insertion.
-  for (NSInteger i = menuIndex + 1; i < [[self menu] numberOfItems]; ++i) {
-    NSMenuItem* item = [[self menu] itemAtIndex:i];
-    [item setTag:[item tag] + 1];
-  }
+  return wrench_model_;

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

Keep this as it was.

 }
 
 // Fit the localized strings into the Cut/Copy/Paste control, then resize the
 // whole menu item accordingly.
 - (void)adjustPositioning {
   const CGFloat kButtonPadding = 12;
   CGFloat delta = 0;
 
   // Go through the three buttons from right-to-left, adjusting the size to fit
   // the localized strings while keeping them all aligned on their horizontal
@@ skipping 30 matching lines @@
   parentFrame.size.width += delta;
   parentFrame.origin.x -= delta;
   [[editCut_ superview] setFrame:parentFrame];
 }
 
 - (NSButton*)zoomDisplay {
   return zoomDisplay_;
 }
 
 @end  // @implementation WrenchMenuController