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

BUG=58030
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10824402

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152767 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 78 insertions, 88 deletions

diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 00e37f96..bde489c 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -121,7 +121,7 @@ void BackgroundModeManager::BackgroundModeData::BuildProfileMenu(
       const std::string& name = (*cursor)->name();
       menu->AddItem(position, UTF8ToUTF16(name));
       if (icon)
-        menu->SetIcon(menu->GetItemCount() - 1, *icon);
+        menu->SetIcon(menu->GetItemCount() - 1, gfx::Image(*icon));
     }
   }
   if (containing_menu)
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index a0acc26..2aa7096 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -153,7 +153,7 @@ class NetworkMenuModel : public ui::MenuModel {
                                 ui::Accelerator* accelerator) const OVERRIDE;
   virtual bool IsItemCheckedAt(int index) const OVERRIDE;
   virtual int GetGroupIdAt(int index) const OVERRIDE;
-  virtual bool GetIconAt(int index, gfx::ImageSkia* icon) OVERRIDE;
+  virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE;
   virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(
       int index) const OVERRIDE;
   virtual bool IsEnabledAt(int index) const OVERRIDE;
@@ -376,9 +376,9 @@ int NetworkMenuModel::GetGroupIdAt(int index) const {
   return 0;
 }
 
-bool NetworkMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) {
+bool NetworkMenuModel::GetIconAt(int index, gfx::Image* icon) {
   if (!menu_items_[index].icon.isNull()) {
-    *icon = menu_items_[index].icon;
+    *icon = gfx::Image(menu_items_[index].icon);
     return true;
   }
   return false;
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 486413f..3ca6165 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -497,7 +497,7 @@ void RenderViewContextMenu::SetExtensionIcon(const std::string& extension_id) {
   DCHECK(icon.width() == gfx::kFaviconSize);
   DCHECK(icon.height() == gfx::kFaviconSize);
 
-  menu_model_.SetIcon(index, icon);
+  menu_model_.SetIcon(index, gfx::Image(icon));
 }
 
 void RenderViewContextMenu::AppendAllExtensionItems() {
diff --git a/chrome/browser/ui/cocoa/menu_controller.mm b/chrome/browser/ui/cocoa/menu_controller.mm
index c66d38e..aae1dcb 100644
--- a/chrome/browser/ui/cocoa/menu_controller.mm
+++ b/chrome/browser/ui/cocoa/menu_controller.mm
@@ -10,8 +10,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"
-#include "ui/gfx/image/image_skia_util_mac.h"
+#include "ui/gfx/image/image.h"
 
 @interface MenuController (Private)
 - (void)addSeparatorToMenu:(NSMenu*)menu
@@ -106,13 +105,9 @@
                           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) {
@@ -165,11 +160,10 @@
       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);
   }
diff --git a/chrome/browser/ui/cocoa/menu_controller_unittest.mm b/chrome/browser/ui/cocoa/menu_controller_unittest.mm
index 0fd9a87..c275005 100644
--- a/chrome/browser/ui/cocoa/menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/menu_controller_unittest.mm
@@ -14,7 +14,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image.h"
 
 namespace {
 
@@ -75,23 +75,23 @@ class Delegate : public ui::SimpleMenuModel::Delegate {
 // the label/icon in the model are reflected in the menu.
 class DynamicDelegate : public Delegate {
  public:
-  DynamicDelegate() : icon_(NULL) {}
+  DynamicDelegate() {}
   virtual bool IsItemForCommandIdDynamic(int command_id) const { return true; }
   virtual string16 GetLabelForCommandId(int command_id) const { return label_; }
-  virtual bool GetIconForCommandId(int command_id, gfx::ImageSkia* icon) const {
-    if (icon_) {
-      *icon = *icon_;
-      return true;
-    } else {
+  virtual bool GetIconForCommandId(int command_id, gfx::Image* icon) const {
+    if (icon_.IsEmpty()) {
       return false;
+    } else {
+      *icon = icon_;
+      return true;
     }
   }
   void SetDynamicLabel(string16 label) { label_ = label; }
-  void SetDynamicIcon(SkBitmap* icon) { icon_ = icon; }
+  void SetDynamicIcon(const gfx::Image& icon) { icon_ = icon; }
 
  private:
   string16 label_;
-  SkBitmap* icon_;
+  gfx::Image icon_;
 };
 
 TEST_F(MenuControllerTest, EmptyMenu) {
@@ -280,16 +280,16 @@ TEST_F(MenuControllerTest, Dynamic) {
   // Now update the item to have a label of "second" and an icon.
   string16 second = ASCIIToUTF16("second");
   delegate.SetDynamicLabel(second);
-  SkBitmap* bitmap =
-      ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_THROBBER);
-  delegate.SetDynamicIcon(bitmap);
+  const gfx::Image& icon =
+      ResourceBundle::GetSharedInstance().GetNativeImageNamed(IDR_THROBBER);
+  delegate.SetDynamicIcon(icon);
   // Simulate opening the menu and validate that the item label + icon changes.
   Validate(menu.get(), [menu menu]);
   EXPECT_EQ(second, base::SysNSStringToUTF16([item title]));
   EXPECT_TRUE([item image] != nil);
 
   // Now get rid of the icon and make sure it goes away.
-  delegate.SetDynamicIcon(NULL);
+  delegate.SetDynamicIcon(gfx::Image());
   Validate(menu.get(), [menu menu]);
   EXPECT_EQ(second, base::SysNSStringToUTF16([item title]));
   EXPECT_EQ(nil, [item image]);
diff --git a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm
index 172ff59..e7f5696 100644
--- a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm
@@ -10,11 +10,9 @@
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "chrome/browser/ui/toolbar/back_forward_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"
 
 using base::SysUTF16ToNSString;
-using gfx::NSImageFromImageSkia;
 
 @implementation BackForwardMenuController
 
@@ -71,10 +69,10 @@ using gfx::NSImageFromImageSkia;
               keyEquivalent:@""];
       [menuItem autorelease];
 
-      gfx::ImageSkia icon;
+      gfx::Image icon;
       // Icon (if it has one).
       if (model_->GetIconAt(menuID, &icon))
-        [menuItem setImage:NSImageFromImageSkia(icon)];
+        [menuItem setImage:icon.ToNSImage()];
 
       // This will make it call our |-executeMenuItem:| method. We store the
       // |menuID| (or |menu_id|) in the tag.
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc
index 181e519..43f0473 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc
@@ -82,7 +82,7 @@ void BookmarkNodeMenuModel::PopulateMenu() {
       AddItem(kBookmarkItemCommandId, label);
       const gfx::Image& node_icon = model_->GetFavicon(child);
       if (!node_icon.IsEmpty())
-        SetIcon(GetItemCount() - 1, *node_icon.ToSkBitmap());
+        SetIcon(GetItemCount() - 1, node_icon);
       // TODO(mdm): set up an observer to watch for icon load events and set
       // the icons in response.
     }
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index 77a93af..f60b19b 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -249,9 +249,9 @@ class BrowserActionButton : public content::NotificationObserver,
     gtk_widget_queue_draw(button());
   }
 
-  gfx::ImageSkia GetIcon() {
-    return *extension_->browser_action()->GetIcon(
-        toolbar_->GetCurrentTabId()).ToImageSkia();
+  gfx::Image GetIcon() {
+    return extension_->browser_action()->GetIcon(
+        toolbar_->GetCurrentTabId());
   }
 
   MenuGtk* GetContextMenu() {
diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc
index 32790f2..ffa9001 100644
--- a/chrome/browser/ui/gtk/menu_gtk.cc
+++ b/chrome/browser/ui/gtk/menu_gtk.cc
@@ -23,6 +23,7 @@
 #include "ui/base/models/button_menu_item_model.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/gtk_util.h"
+#include "ui/gfx/image/image.h"
 #include "webkit/glue/window_open_disposition.h"
 
 bool MenuGtk::block_activation_ = false;
@@ -326,7 +327,7 @@ GtkWidget* MenuGtk::AppendMenuItemWithLabel(int command_id,
 
 GtkWidget* MenuGtk::AppendMenuItemWithIcon(int command_id,
                                            const std::string& label,
-                                           const SkBitmap& icon) {
+                                           const gfx::Image& icon) {
   std::string converted_label = ui::ConvertAcceleratorsFromWindowsStyle(label);
   GtkWidget* menu_item = BuildMenuItemWithImage(converted_label, icon);
   return AppendMenuItem(command_id, menu_item);
@@ -426,11 +427,9 @@ GtkWidget* MenuGtk::BuildMenuItemWithImage(const std::string& label,
 }
 
 GtkWidget* MenuGtk::BuildMenuItemWithImage(const std::string& label,
-                                           const SkBitmap& icon) {
-  GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(icon);
+                                           const gfx::Image& icon) {
   GtkWidget* menu_item = BuildMenuItemWithImage(label,
-      gtk_image_new_from_pixbuf(pixbuf));
-  g_object_unref(pixbuf);
+      gtk_image_new_from_pixbuf(icon.ToGdkPixbuf()));
   return menu_item;
 }
 
@@ -451,7 +450,7 @@ void MenuGtk::BuildSubmenuFromModel(ui::MenuModel* model, GtkWidget* menu) {
   std::map<int, GtkWidget*> radio_groups;
   GtkWidget* menu_item = NULL;
   for (int i = 0; i < model->GetItemCount(); ++i) {
-    gfx::ImageSkia icon;
+    gfx::Image icon;
     std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
         UTF16ToUTF8(model->GetLabelAt(i)));
     bool connect_to_activate = true;
@@ -490,7 +489,7 @@ void MenuGtk::BuildSubmenuFromModel(ui::MenuModel* model, GtkWidget* menu) {
       case ui::MenuModel::TYPE_COMMAND: {
         int command_id = model->GetCommandIdAt(i);
         if (model->GetIconAt(i, &icon))
-          menu_item = BuildMenuItemWithImage(label, *icon.bitmap());
+          menu_item = BuildMenuItemWithImage(label, icon);
         else
           menu_item = BuildMenuItemWithLabel(label, command_id);
         if (delegate_ && delegate_->AlwaysShowIconForCmd(command_id) &&
@@ -885,12 +884,11 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {
 
         gtk_menu_item_set_label(GTK_MENU_ITEM(widget), label.c_str());
         if (GTK_IS_IMAGE_MENU_ITEM(widget)) {
-          gfx::ImageSkia icon;
+          gfx::Image icon;
           if (model->GetIconAt(id, &icon)) {
-            GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(*icon.bitmap());
             gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(widget),
-                                          gtk_image_new_from_pixbuf(pixbuf));
-            g_object_unref(pixbuf);
+                                          gtk_image_new_from_pixbuf(
+                                              icon.ToGdkPixbuf()));
           } else {
             gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(widget), NULL);
           }
diff --git a/chrome/browser/ui/gtk/menu_gtk.h b/chrome/browser/ui/gtk/menu_gtk.h
index 120be8e..cfd73f9 100644
--- a/chrome/browser/ui/gtk/menu_gtk.h
+++ b/chrome/browser/ui/gtk/menu_gtk.h
@@ -15,7 +15,9 @@
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/gfx/point.h"
 
-class SkBitmap;
+namespace gfx {
+class Image;
+}
 
 namespace ui {
 class ButtonMenuItemModel;
@@ -64,7 +66,7 @@ class MenuGtk {
   // is the new menu item.
   GtkWidget* AppendMenuItemWithLabel(int command_id, const std::string& label);
   GtkWidget* AppendMenuItemWithIcon(int command_id, const std::string& label,
-                                    const SkBitmap& icon);
+                                    const gfx::Image& icon);
   GtkWidget* AppendCheckMenuItemWithLabel(int command_id,
                                           const std::string& label);
   GtkWidget* AppendSeparator();
@@ -125,7 +127,7 @@ class MenuGtk {
  private:
   // Builds a GtkImageMenuItem.
   GtkWidget* BuildMenuItemWithImage(const std::string& label,
-                                    const SkBitmap& icon);
+                                    const gfx::Image& icon);
 
   GtkWidget* BuildMenuItemWithImage(const std::string& label,
                                     GtkWidget* image);
diff --git a/chrome/browser/ui/toolbar/action_box_menu_model.cc b/chrome/browser/ui/toolbar/action_box_menu_model.cc
index 7cd3985..fcd5a85 100644
--- a/chrome/browser/ui/toolbar/action_box_menu_model.cc
+++ b/chrome/browser/ui/toolbar/action_box_menu_model.cc
@@ -33,10 +33,10 @@ ActionBoxMenuModel::ActionBoxMenuModel(Browser* browser,
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   InsertItemWithStringIdAt(0, IDC_CHROME_TO_MOBILE_PAGE,
                            IDS_CHROME_TO_MOBILE_BUBBLE_TOOLTIP);
-  SetIcon(0, *rb.GetImageSkiaNamed(IDR_MOBILE));
+  SetIcon(0, rb.GetNativeImageNamed(IDR_MOBILE));
   InsertItemWithStringIdAt(1, IDC_BOOKMARK_PAGE,
                            starred ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR);
-  SetIcon(1, *rb.GetImageSkiaNamed(starred ? IDR_STAR_LIT : IDR_STAR));
+  SetIcon(1, rb.GetNativeImageNamed(starred ? IDR_STAR_LIT : IDR_STAR));
 
   // Adds extensions to the model.
   int command_id = kFirstExtensionCommandId;
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
index 7673fd6..955a9e7 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
@@ -133,16 +133,16 @@ int BackForwardMenuModel::GetGroupIdAt(int index) const {
   return false;
 }
 
-bool BackForwardMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) {
+bool BackForwardMenuModel::GetIconAt(int index, gfx::Image* icon) {
   if (!ItemHasIcon(index))
     return false;
 
   if (index == GetItemCount() - 1) {
-    *icon = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+    *icon = ResourceBundle::GetSharedInstance().GetNativeImageNamed(
         IDR_HISTORY_FAVICON);
   } else {
     NavigationEntry* entry = GetNavigationEntry(index);
-    *icon = *entry->GetFavicon().image.ToImageSkia();
+    *icon = entry->GetFavicon().image;
     if (!entry->GetFavicon().valid && menu_model_delegate()) {
       FetchFavicon(entry);
     }
@@ -277,17 +277,13 @@ void BackForwardMenuModel::OnFavIconDataAvailable(
 
     // Now that we have a valid NavigationEntry, decode the favicon and assign
     // it to the NavigationEntry.
-    SkBitmap fav_icon;
-    if (gfx::PNGCodec::Decode(favicon.image_data->front(),
-                              favicon.image_data->size(),
-                              &fav_icon)) {
+    gfx::Image icon(favicon.image_data->front(), favicon.image_data->size());
+    if (!icon.IsEmpty()) {
       entry->GetFavicon().valid = true;
       entry->GetFavicon().url = favicon.icon_url;
-      if (fav_icon.empty())
-        return;
       // TODO: Once the history service returns more representations,
       // use them all instead of having just the lodpi favicon.
-      entry->GetFavicon().image = gfx::Image(fav_icon);
+      entry->GetFavicon().image = icon;
       if (menu_model_delegate()) {
         menu_model_delegate()->OnIconChanged(model_index);
       }
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h
index 36ed0e5..8145fb9 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.h
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h
@@ -23,7 +23,7 @@ class WebContents;
 }
 
 namespace gfx {
-class ImageSkia;
+class Image;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -60,7 +60,7 @@ class BackForwardMenuModel : public ui::MenuModel {
                                 ui::Accelerator* accelerator) const OVERRIDE;
   virtual bool IsItemCheckedAt(int index) const OVERRIDE;
   virtual int GetGroupIdAt(int index) const OVERRIDE;
-  virtual bool GetIconAt(int index, gfx::ImageSkia* icon) OVERRIDE;
+  virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE;
   virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(
       int index) const OVERRIDE;
   virtual bool IsEnabledAt(int index) const OVERRIDE;
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
index 499b2cc..2abee51 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
@@ -534,7 +534,7 @@ TEST_F(BackFwdMenuModelTest, FaviconLoadTest) {
 
   // Will return the current icon (default) but start an anync call
   // to retrieve the favicon from the favicon service.
-  gfx::ImageSkia default_icon;
+  gfx::Image default_icon;
   back_model.GetIconAt(0, &default_icon);
 
   // Make the favicon service run GetFavIconForURL,
@@ -545,12 +545,12 @@ TEST_F(BackFwdMenuModelTest, FaviconLoadTest) {
   EXPECT_TRUE(favicon_delegate.was_called());
 
   // Verify the bitmaps match.
-  gfx::ImageSkia valid_icon;
+  gfx::Image valid_icon;
   // This time we will get the new favicon returned.
   back_model.GetIconAt(0, &valid_icon);
 
-  SkBitmap default_icon_bitmap = *default_icon.bitmap();
-  SkBitmap valid_icon_bitmap = *valid_icon.bitmap();
+  SkBitmap default_icon_bitmap = *default_icon.ToSkBitmap();
+  SkBitmap valid_icon_bitmap = *valid_icon.ToSkBitmap();
 
   SkAutoLockPixels a(new_icon_bitmap);
   SkAutoLockPixels b(valid_icon_bitmap);
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 2ae71b9..ef015d0 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -299,14 +299,14 @@ string16 WrenchMenuModel::GetLabelForCommandId(int command_id) const {
 }
 
 bool WrenchMenuModel::GetIconForCommandId(int command_id,
-                                          gfx::ImageSkia* icon) const {
+                                          gfx::Image* icon) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   switch (command_id) {
     case IDC_UPGRADE_DIALOG: {
       if (UpgradeDetector::GetInstance()->notify_upgrade()) {
-        *icon = *rb.GetNativeImageNamed(
+        *icon = rb.GetNativeImageNamed(
             UpgradeDetector::GetInstance()->GetIconResourceID(
-                UpgradeDetector::UPGRADE_ICON_TYPE_MENU_ICON)).ToImageSkia();
+                UpgradeDetector::UPGRADE_ICON_TYPE_MENU_ICON));
         return true;
       }
       return false;
@@ -319,7 +319,7 @@ bool WrenchMenuModel::GetIconForCommandId(int command_id,
       if (error && error->HasCustomizedSyncMenuItem()) {
         int icon_id = error->MenuItemIconResourceID();
         if (icon_id) {
-          *icon = *rb.GetNativeImageNamed(icon_id).ToImageSkia();
+          *icon = rb.GetNativeImageNamed(icon_id);
           return true;
         }
       }
@@ -523,8 +523,8 @@ void WrenchMenuModel::Build() {
 
 #if defined(OS_WIN)
   SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES),
-          *ui::ResourceBundle::GetSharedInstance().
-          GetImageSkiaNamed(IDR_CONFLICT_MENU));
+          ui::ResourceBundle::GetSharedInstance().
+              GetNativeImageNamed(IDR_CONFLICT_MENU));
 #endif
 
   if (!is_touch_menu) {
@@ -533,7 +533,7 @@ void WrenchMenuModel::Build() {
     if (browser_defaults::kShowHelpMenuItemIcon) {
       ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE_VIA_MENU),
-              *rb.GetImageSkiaNamed(IDR_HELP_MENU));
+              rb.GetNativeImageNamed(IDR_HELP_MENU));
     }
   }
 
@@ -573,9 +573,9 @@ void WrenchMenuModel::AddGlobalErrorMenuItems() {
       AddItem(error->MenuItemCommandID(), error->MenuItemLabel());
       int icon_id = error->MenuItemIconResourceID();
       if (icon_id) {
-        gfx::Image& image = rb.GetImageNamed(icon_id);
+        const gfx::Image& image = rb.GetNativeImageNamed(icon_id);
         SetIcon(GetIndexOfCommandId(error->MenuItemCommandID()),
-                *image.ToImageSkia());
+                image);
       }
     }
   }
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h
index d2f65f7..490c7ec 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.h
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.h
@@ -87,7 +87,7 @@ class WrenchMenuModel : public ui::SimpleMenuModel,
   virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
   virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE;
   virtual bool GetIconForCommandId(int command_id,
-                                   gfx::ImageSkia* icon) const OVERRIDE;
+                                   gfx::Image* icon) const OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc
index 74371a8..9dd7fb5 100644
--- a/chrome/browser/ui/views/menu_model_adapter_test.cc
+++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -143,7 +143,7 @@ class CommonMenuModel : public ui::MenuModel {
     return 0;
   }
 
-  virtual bool GetIconAt(int index, gfx::ImageSkia* icon) OVERRIDE {
+  virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE {
     return false;
   }
 
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index 5389a23f..3865e17 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -38,6 +38,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
@@ -1081,9 +1082,9 @@ MenuItemView* WrenchMenu::AppendMenuItem(MenuItemView* parent,
     menu_item->SetVisible(model->IsVisibleAt(index));
 
     if (menu_type == MenuModel::TYPE_COMMAND && model->HasIcons()) {
-      gfx::ImageSkia icon;
+      gfx::Image icon;
       if (model->GetIconAt(index, &icon))
-        menu_item->SetIcon(icon);
+        menu_item->SetIcon(*icon.ToImageSkia());
     }
   }
 
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index ed64f17..f7363f0 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -15,6 +15,7 @@
 #include "content/public/browser/web_ui.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
@@ -84,9 +85,9 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {
     base::DictionaryValue* item = new base::DictionaryValue();
     item->SetInteger("id", id);
     item->SetString("label", model->GetLabelAt(i));
-    gfx::ImageSkia icon;
+    gfx::Image icon;
     if (model->GetIconAt(i, &icon)) {
-      SkBitmap icon_bitmap = icon.GetRepresentation(
+      SkBitmap icon_bitmap = icon.ToImageSkia()->GetRepresentation(
           ui::GetScaleFactorFromScale(web_ui_->GetDeviceScale())).sk_bitmap();
       item->SetString("icon", web_ui_util::GetImageDataUrl(icon_bitmap));
     }