Change SimpleMenuModel on OSX to support dynamic icons

chrome/browser/ui/cocoa/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/ui/cocoa/menu_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/menus/accelerator_cocoa.h"
 #include "app/menus/simple_menu_model.h"
 #include "base/logging.h"
@@ skipping 126 matching lines @@
   NSInteger modelIndex = [item tag];
   menus::MenuModel* model =
       static_cast<menus::MenuModel*>(
           [[(id)item representedObject] pointerValue]);
   DCHECK(model);
   if (model) {
     BOOL checked = model->IsItemCheckedAt(modelIndex);
     DCHECK([(id)item isKindOfClass:[NSMenuItem class]]);
     [(id)item setState:(checked ? NSOnState : NSOffState)];
     [(id)item setHidden:(!model->IsVisibleAt(modelIndex))];
-    if (model->IsLabelDynamicAt(modelIndex)) {
+    if (model->IsItemDynamicAt(modelIndex)) {
+      // Update the label and the icon.
       NSString* label =
           l10n_util::FixUpWindowsStyleLabel(model->GetLabelAt(modelIndex));
       [(id)item setTitle:label];
+      SkBitmap skiaIcon;
+      if (model->GetIconAt(modelIndex, &skiaIcon) && !skiaIcon.isNull()) {
+        // We have an icon.
+        NSImage* icon = gfx::SkBitmapToNSImage(skiaIcon);
+        if (icon) {

[Evan Stade, 2010/12/14 01:20:13]

no {}

[Andrew T Wilson (Slow), 2010/12/14 18:23:27]

Done.

+          [(id)item setImage:icon];

[Evan Stade, 2010/12/14 01:20:13]

it strikes me that you'll either want to setImage to a valid icon, or setImage
to nil, but this control flow allows for neither happening.

[Andrew T Wilson (Slow), 2010/12/14 18:23:27]

Good point - my previous code was just leaving the image unchanged, but it's
better to be deterministic and explicitly remove the icon rather than just
mysteriously failing.

+        }
+      } else {
+        // No icon.
+        [(id)item setImage:nil];
+      }
     }
     return model->IsEnabledAt(modelIndex);
   }
   return NO;
 }
 
 // Called when the user chooses a particular menu item. |sender| is the menu
 // item chosen.
 - (void)itemSelected:(id)sender {
   NSInteger modelIndex = [sender tag];
@@ skipping 15 matching lines @@
     if (useWithPopUpButtonCell_) {
       scoped_nsobject<NSMenuItem> blankItem(
           [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""]);
       [menu_ insertItem:blankItem atIndex:0];
     }
   }
   return menu_.get();
 }
 
 @end