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

ui/views/controls/menu/menu_win.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_win.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 22 matching lines @@
 const int kItemRightMargin = 10;
 // The width for displaying the sub-menu arrow.
 const int kArrowWidth = 10;
 
 // Current active MenuHostWindow. If NULL, no menu is active.
 static MenuHostWindow* active_host_window = NULL;
 
 // The data of menu items needed to display.
 struct MenuWin::ItemData {
   string16 label;
-  SkBitmap icon;
+  gfx::ImageSkia icon;
   bool submenu;
 };
 
 namespace {
 
 static int ChromeGetMenuItemID(HMENU hMenu, int pos) {
   // The built-in Windows GetMenuItemID doesn't work for submenus,
   // so here's our own implementation.
   MENUITEMINFO mii = {0};
   mii.cbSize = sizeof(mii);
@@ skipping 202 matching lines @@
 
 MenuWin::~MenuWin() {
   STLDeleteContainerPointers(submenus_.begin(), submenus_.end());
   STLDeleteContainerPointers(item_data_.begin(), item_data_.end());
   DestroyMenu(menu_);
 }
 
 void MenuWin::AddMenuItemWithIcon(int index,
                                   int item_id,
                                   const string16& label,
-                                  const SkBitmap& icon) {
+                                  const gfx::ImageSkia& icon) {
   owner_draw_ = true;
   Menu::AddMenuItemWithIcon(index, item_id, label, icon);
 }
 
 Menu* MenuWin::AddSubMenuWithIcon(int index,
                                   int item_id,
                                   const string16& label,
-                                  const SkBitmap& icon) {
+                                  const gfx::ImageSkia& icon) {
   MenuWin* submenu = new MenuWin(this);
   submenus_.push_back(submenu);
   AddMenuItemInternal(index, item_id, label, icon, submenu->menu_, NORMAL);
   return submenu;
 }
 
 void MenuWin::AddSeparator(int index) {
   MENUITEMINFO mii;
   mii.cbSize = sizeof(mii);
   mii.fMask = MIIM_FTYPE;
@@ skipping 13 matching lines @@
 
 void MenuWin::SetMenuLabel(int item_id, const string16& label) {
   MENUITEMINFO mii = {0};
   mii.cbSize = sizeof(mii);
   mii.fMask = MIIM_STRING;
   mii.dwTypeData = const_cast<wchar_t*>(label.c_str());
   mii.cch = static_cast<UINT>(label.size());
   SetMenuItemInfo(menu_, item_id, false, &mii);
 }
 
-bool MenuWin::SetIcon(const SkBitmap& icon, int item_id) {
+bool MenuWin::SetIcon(const gfx::ImageSkia& icon, int item_id) {
   if (!owner_draw_)
     owner_draw_ = true;
 
   const int num_items = GetMenuItemCount(menu_);
   int sep_count = 0;
   for (int i = 0; i < num_items; ++i) {
     if (!(GetMenuState(menu_, i, MF_BYPOSITION) & MF_SEPARATOR)) {
       if (ChromeGetMenuItemID(menu_, i) == item_id) {
         item_data_[i - sep_count]->icon = icon;
         // When the menu is running, we use SetMenuItemInfo to let Windows
@@ skipping 60 matching lines @@
   EndMenu();
 }
 
 int MenuWin::ItemCount() {
   return GetMenuItemCount(menu_);
 }
 
 void MenuWin::AddMenuItemInternal(int index,
                                   int item_id,
                                   const string16& label,
-                                  const SkBitmap& icon,
+                                  const gfx::ImageSkia& icon,
                                   MenuItemType type) {
   AddMenuItemInternal(index, item_id, label, icon, NULL, type);
 }
 
 void MenuWin::AddMenuItemInternal(int index,
                                   int item_id,
                                   const string16& label,
-                                  const SkBitmap& icon,
+                                  const gfx::ImageSkia& icon,
                                   HMENU submenu,
                                   MenuItemType type) {
   DCHECK(type != SEPARATOR) << "Call AddSeparator instead!";
 
   if (!owner_draw_ && !icon.empty())
     owner_draw_ = true;
 
   if (label.empty() && !delegate()) {
     // No label and no delegate; don't add an empty menu.
     // It appears under some circumstance we're getting an empty label
@@ skipping 155 matching lines @@
       break;
 
     default:
       NOTREACHED();
       return 0;
   }
   return align_flags;
 }
 
 }  // namespace views