Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

chrome/browser/ui/cocoa/menu_controller.mm

Index: chrome/browser/ui/cocoa/menu_controller.mm
diff --git a/chrome/browser/ui/cocoa/menu_controller.mm b/chrome/browser/ui/cocoa/menu_controller.mm
index 2cb6a600ab01c9ecbbf774d021ecc7b75ccfcbae..8de231b6534227b9c3f9a98c560876ab9e145713 100644
--- a/chrome/browser/ui/cocoa/menu_controller.mm
+++ b/chrome/browser/ui/cocoa/menu_controller.mm
@@ -12,6 +12,7 @@
 #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"
 
 @interface MenuController (Private)
 - (void)addSeparatorToMenu:(NSMenu*)menu
@@ -106,9 +107,9 @@
                           keyEquivalent:@""]);
 
   // If the menu item has an icon, set it.
-  SkBitmap skiaIcon;
+  gfx::ImageSkia skiaIcon;
   if (model->GetIconAt(modelIndex, &skiaIcon) && !skiaIcon.isNull()) {
-    NSImage* icon = gfx::SkBitmapToNSImage(skiaIcon);
+    NSImage* icon = gfx::SkBitmapToNSImage(*skiaIcon.bitmap());
     if (icon) {
       [item setImage:icon];
     }
@@ -165,10 +166,10 @@
       NSString* label =
           l10n_util::FixUpWindowsStyleLabel(model->GetLabelAt(modelIndex));
       [(id)item setTitle:label];
-      SkBitmap skiaIcon;
+      gfx::ImageSkia skiaIcon;
       NSImage* icon = nil;
       if (model->GetIconAt(modelIndex, &skiaIcon) && !skiaIcon.isNull())
-        icon = gfx::SkBitmapToNSImage(skiaIcon);
+        icon = gfx::SkBitmapToNSImage(*skiaIcon.bitmap());
       [(id)item setImage:icon];
     }
     return model->IsEnabledAt(modelIndex);