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

ui/views/controls/menu/menu_item_view.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_item_view.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
@@ skipping 185 matching lines @@
 void MenuItemView::Cancel() {
   if (controller_ && !canceled_) {
     canceled_ = true;
     controller_->Cancel(MenuController::EXIT_ALL);
   }
 }
 
 MenuItemView* MenuItemView::AddMenuItemAt(int index,
                                           int item_id,
                                           const string16& label,
-                                          const SkBitmap& icon,
+                                          const gfx::ImageSkia& icon,
                                           Type type) {
   DCHECK_NE(type, EMPTY);
   DCHECK_LE(0, index);
   if (!submenu_)
     CreateSubmenu();
   DCHECK_GE(submenu_->child_count(), index);
   if (type == SEPARATOR) {
     submenu_->AddChildViewAt(new MenuSeparator(), index);
     return NULL;
   }
@@ skipping 20 matching lines @@
 
   // RemoveChildView() does not delete the item, which is a good thing
   // in case a submenu is being displayed while items are being removed.
   // Deletion will be done by ChildrenChanged() or at destruction.
   removed_items_.push_back(item);
 }
 
 MenuItemView* MenuItemView::AppendMenuItem(int item_id,
                                            const string16& label,
                                            Type type) {
-  return AppendMenuItemImpl(item_id, label, SkBitmap(), type);
+  return AppendMenuItemImpl(item_id, label, gfx::ImageSkia(), type);
 }
 
 MenuItemView* MenuItemView::AppendSubMenu(int item_id,
                                           const string16& label) {
-  return AppendMenuItemImpl(item_id, label, SkBitmap(), SUBMENU);
+  return AppendMenuItemImpl(item_id, label, gfx::ImageSkia(), SUBMENU);
 }
 
 MenuItemView* MenuItemView::AppendSubMenuWithIcon(int item_id,
                                                   const string16& label,
-                                                  const SkBitmap& icon) {
+                                                  const gfx::ImageSkia& icon) {
   return AppendMenuItemImpl(item_id, label, icon, SUBMENU);
 }
 
 MenuItemView* MenuItemView::AppendMenuItemWithLabel(int item_id,
                                                     const string16& label) {
   return AppendMenuItem(item_id, label, NORMAL);
 }
 
 MenuItemView* MenuItemView::AppendDelegateMenuItem(int item_id) {
   return AppendMenuItem(item_id, string16(), NORMAL);
 }
 
 void MenuItemView::AppendSeparator() {
-  AppendMenuItemImpl(0, string16(), SkBitmap(), SEPARATOR);
+  AppendMenuItemImpl(0, string16(), gfx::ImageSkia(), SEPARATOR);
 }
 
 MenuItemView* MenuItemView::AppendMenuItemWithIcon(int item_id,
                                                    const string16& label,
-                                                   const SkBitmap& icon) {
+                                                   const gfx::ImageSkia& icon) {
   return AppendMenuItemImpl(item_id, label, icon, NORMAL);
 }
 
 MenuItemView* MenuItemView::AppendMenuItemFromModel(ui::MenuModel* model,
                                                     int index,
                                                     int id) {
-  SkBitmap icon;
+  gfx::ImageSkia icon;
   string16 label;
   MenuItemView::Type type;
   ui::MenuModel::ItemType menu_type = model->GetTypeAt(index);
   switch (menu_type) {
     case ui::MenuModel::TYPE_COMMAND:
       model->GetIconAt(index, &icon);
       type = MenuItemView::NORMAL;
       label = model->GetLabelAt(index);
       break;
     case ui::MenuModel::TYPE_CHECK:
@@ skipping 16 matching lines @@
       NOTREACHED();
       type = MenuItemView::NORMAL;
       break;
   }
 
   return AppendMenuItemImpl(id, label, icon, type);
 }
 
 MenuItemView* MenuItemView::AppendMenuItemImpl(int item_id,
                                                const string16& label,
-                                               const SkBitmap& icon,
+                                               const gfx::ImageSkia& icon,
                                                Type type) {
   const int index = submenu_ ? submenu_->child_count() : 0;
   return AddMenuItemAt(index, item_id, label, icon, type);
 }
 
 SubmenuView* MenuItemView::CreateSubmenu() {
   if (!submenu_)
     submenu_ = new SubmenuView(this);
   return submenu_;
 }
@@ skipping 15 matching lines @@
   selected_ = selected;
   SchedulePaint();
 }
 
 void MenuItemView::SetTooltip(const string16& tooltip, int item_id) {
   MenuItemView* item = GetMenuItemByID(item_id);
   DCHECK(item);
   item->tooltip_ = tooltip;
 }
 
-void MenuItemView::SetIcon(const SkBitmap& icon, int item_id) {
+void MenuItemView::SetIcon(const gfx::ImageSkia& icon, int item_id) {
   MenuItemView* item = GetMenuItemByID(item_id);
   DCHECK(item);
   item->SetIcon(icon);
 }
 
-void MenuItemView::SetIcon(const SkBitmap& icon) {
+void MenuItemView::SetIcon(const gfx::ImageSkia& icon) {
   icon_ = icon;
   SchedulePaint();
 }
 
 void MenuItemView::OnPaint(gfx::Canvas* canvas) {
   PaintButton(canvas, PB_NORMAL);
 }
 
 gfx::Size MenuItemView::GetPreferredSize() {
   if (pref_size_.IsEmpty())
@@ skipping 404 matching lines @@
 }
 
 bool MenuItemView::IsContainer() const {
   // Let the first child take over |this| when we only have one child and no
   // title.  Note that what child_count() returns is the number of children,
   // not the number of menu items.
   return child_count() == 1 && title_.empty();
 }
 
 }  // namespace views