Convert ui::MenuModel to use gfx::Image instead of ImageSkia.

chrome/browser/ui/cocoa/menu_controller.mm

 // Copyright (c) 2012 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 "base/logging.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #include "ui/base/accelerators/accelerator_cocoa.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/models/simple_menu_model.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/image/image_skia_util_mac.h"
+#include "ui/gfx/image/image.h"
 
 @interface MenuController (Private)
 - (void)addSeparatorToMenu:(NSMenu*)menu
                    atIndex:(int)index;
 @end
 
 @implementation MenuController
 
 @synthesize model = model_;
 @synthesize useWithPopUpButtonCell = useWithPopUpButtonCell_;
@@ skipping 74 matching lines @@
             fromModel:(ui::MenuModel*)model
            modelIndex:(int)modelIndex {
   NSString* label =
       l10n_util::FixUpWindowsStyleLabel(model->GetLabelAt(modelIndex));
   scoped_nsobject<NSMenuItem> item(
       [[NSMenuItem alloc] initWithTitle:label
                                  action:@selector(itemSelected:)
                           keyEquivalent:@""]);
 
   // If the menu item has an icon, set it.
-  gfx::ImageSkia skiaIcon;
-  if (model->GetIconAt(modelIndex, &skiaIcon) && !skiaIcon.isNull()) {
-    NSImage* icon = gfx::NSImageFromImageSkia(skiaIcon);
-    if (icon) {
-      [item setImage:icon];
-    }
-  }
+  gfx::Image icon;
+  if (model->GetIconAt(modelIndex, &icon) && !icon.IsEmpty())
+    [item setImage:icon.ToNSImage()];
 
   ui::MenuModel::ItemType type = model->GetTypeAt(modelIndex);
   if (type == ui::MenuModel::TYPE_SUBMENU) {
     // Recursively build a submenu from the sub-model at this index.
     [item setTarget:nil];
     [item setAction:nil];
     ui::MenuModel* submenuModel = model->GetSubmenuModelAt(modelIndex);
     NSMenu* submenu =
         [self menuFromModel:(ui::SimpleMenuModel*)submenuModel];
     [item setSubmenu:submenu];
@@ skipping 32 matching lines @@
   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->IsItemDynamicAt(modelIndex)) {
       // Update the label and the icon.
       NSString* label =
           l10n_util::FixUpWindowsStyleLabel(model->GetLabelAt(modelIndex));
       [(id)item setTitle:label];
-      gfx::ImageSkia skiaIcon;
-      NSImage* icon = nil;
-      if (model->GetIconAt(modelIndex, &skiaIcon) && !skiaIcon.isNull())
-        icon = gfx::NSImageFromImageSkia(skiaIcon);
-      [(id)item setImage:icon];
+
+      gfx::Image icon;
+      model->GetIconAt(modelIndex, &icon);
+      [(id)item setImage:icon.IsEmpty() ? nil : icon.ToNSImage()];
     }
     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 30 matching lines @@
 }
 
 - (void)menuDidClose:(NSMenu*)menu {
   if (isMenuOpen_) {
     model_->MenuClosed();
     isMenuOpen_ = NO;
   }
 }
 
 @end