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

ui/base/models/simple_menu_model.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/base/models/simple_menu_model.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image.h"
 
 namespace ui {
 
 const int kSeparatorId = -1;
 
 struct SimpleMenuModel::Item {
   int command_id;
   string16 label;
-  gfx::ImageSkia icon;
+  gfx::Image icon;
   ItemType type;
   int group_id;
   MenuModel* submenu;
   ButtonMenuItemModel* button_model;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMenuModel::Delegate, public:
 
 bool SimpleMenuModel::Delegate::IsCommandIdVisible(int command_id) const {
   return true;
 }
 
 bool SimpleMenuModel::Delegate::IsItemForCommandIdDynamic(
     int command_id) const {
   return false;
 }
 
 string16 SimpleMenuModel::Delegate::GetLabelForCommandId(int command_id) const {
   return string16();
 }
 
 bool SimpleMenuModel::Delegate::GetIconForCommandId(
-    int command_id, gfx::ImageSkia* image_skia) const {
+    int command_id, gfx::Image* image_skia) const {
   return false;
 }
 
 void SimpleMenuModel::Delegate::CommandIdHighlighted(int command_id) {
 }
 
 void SimpleMenuModel::Delegate::ExecuteCommand(
     int command_id, int event_flags) {
   ExecuteCommand(command_id);
 }
@@ skipping 10 matching lines @@
 SimpleMenuModel::SimpleMenuModel(Delegate* delegate)
     : delegate_(delegate),
       menu_model_delegate_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
 SimpleMenuModel::~SimpleMenuModel() {
 }
 
 void SimpleMenuModel::AddItem(int command_id, const string16& label) {
-  Item item = { command_id, label, gfx::ImageSkia(), TYPE_COMMAND, -1, NULL,
+  Item item = { command_id, label, gfx::Image(), TYPE_COMMAND, -1, NULL,
                 NULL };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddItemWithStringId(int command_id, int string_id) {
   AddItem(command_id, l10n_util::GetStringUTF16(string_id));
 }
 
 void SimpleMenuModel::AddSeparator() {
-  Item item = { kSeparatorId, string16(), gfx::ImageSkia(), TYPE_SEPARATOR, -1,
+  Item item = { kSeparatorId, string16(), gfx::Image(), TYPE_SEPARATOR, -1,
                 NULL, NULL };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddCheckItem(int command_id, const string16& label) {
-  Item item = { command_id, label, gfx::ImageSkia(), TYPE_CHECK, -1, NULL,
+  Item item = { command_id, label, gfx::Image(), TYPE_CHECK, -1, NULL,
                 NULL };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddCheckItemWithStringId(int command_id, int string_id) {
   AddCheckItem(command_id, l10n_util::GetStringUTF16(string_id));
 }
 
 void SimpleMenuModel::AddRadioItem(int command_id, const string16& label,
                                    int group_id) {
-  Item item = { command_id, label, gfx::ImageSkia(), TYPE_RADIO, group_id, NULL,
+  Item item = { command_id, label, gfx::Image(), TYPE_RADIO, group_id, NULL,
                 NULL };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddRadioItemWithStringId(int command_id, int string_id,
                                                int group_id) {
   AddRadioItem(command_id, l10n_util::GetStringUTF16(string_id), group_id);
 }
 
 void SimpleMenuModel::AddButtonItem(int command_id,
                                     ButtonMenuItemModel* model) {
-  Item item = { command_id, string16(), gfx::ImageSkia(), TYPE_BUTTON_ITEM, -1,
+  Item item = { command_id, string16(), gfx::Image(), TYPE_BUTTON_ITEM, -1,
                 NULL, model };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddSubMenu(int command_id, const string16& label,
                                  MenuModel* model) {
-  Item item = { command_id, label, gfx::ImageSkia(), TYPE_SUBMENU, -1, model,
+  Item item = { command_id, label, gfx::Image(), TYPE_SUBMENU, -1, model,
                 NULL };
   AppendItem(item);
 }
 
 void SimpleMenuModel::AddSubMenuWithStringId(int command_id,
                                              int string_id, MenuModel* model) {
   AddSubMenu(command_id, l10n_util::GetStringUTF16(string_id), model);
 }
 
 void SimpleMenuModel::InsertItemAt(
     int index, int command_id, const string16& label) {
-  Item item = { command_id, label, gfx::ImageSkia(), TYPE_COMMAND, -1, NULL,
+  Item item = { command_id, label, gfx::Image(), TYPE_COMMAND, -1, NULL,
                 NULL };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertItemWithStringIdAt(
     int index, int command_id, int string_id) {
   InsertItemAt(index, command_id, l10n_util::GetStringUTF16(string_id));
 }
 
 void SimpleMenuModel::InsertSeparatorAt(int index) {
-  Item item = { kSeparatorId, string16(), gfx::ImageSkia(), TYPE_SEPARATOR, -1,
+  Item item = { kSeparatorId, string16(), gfx::Image(), TYPE_SEPARATOR, -1,
                 NULL, NULL };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertCheckItemAt(
     int index, int command_id, const string16& label) {
-  Item item = { command_id, label, gfx::ImageSkia(), TYPE_CHECK, -1, NULL,
+  Item item = { command_id, label, gfx::Image(), TYPE_CHECK, -1, NULL,
                 NULL };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertCheckItemWithStringIdAt(
     int index, int command_id, int string_id) {
   InsertCheckItemAt(
       FlipIndex(index), command_id, l10n_util::GetStringUTF16(string_id));
 }
 
 void SimpleMenuModel::InsertRadioItemAt(
     int index, int command_id, const string16& label, int group_id) {
-  Item item = { command_id, label, gfx::ImageSkia(), TYPE_RADIO, group_id, NULL,
+  Item item = { command_id, label, gfx::Image(), TYPE_RADIO, group_id, NULL,
                 NULL };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertRadioItemWithStringIdAt(
     int index, int command_id, int string_id, int group_id) {
   InsertRadioItemAt(
       index, command_id, l10n_util::GetStringUTF16(string_id), group_id);
 }
 
 void SimpleMenuModel::InsertSubMenuAt(
     int index, int command_id, const string16& label, MenuModel* model) {
-  Item item = { command_id, label, gfx::ImageSkia(), TYPE_SUBMENU, -1, model,
+  Item item = { command_id, label, gfx::Image(), TYPE_SUBMENU, -1, model,
                 NULL };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertSubMenuWithStringIdAt(
     int index, int command_id, int string_id, MenuModel* model) {
   InsertSubMenuAt(index, command_id, l10n_util::GetStringUTF16(string_id),
                   model);
 }
 
-void SimpleMenuModel::SetIcon(int index, const gfx::ImageSkia& icon) {
+void SimpleMenuModel::SetIcon(int index, const gfx::Image& icon) {
   items_[ValidateItemIndex(index)].icon = icon;
 }
 
 void SimpleMenuModel::Clear() {
   items_.clear();
 }
 
 int SimpleMenuModel::GetIndexOfCommandId(int command_id) {
   for (ItemVector::iterator i = items_.begin(); i != items_.end(); ++i) {
     if (i->command_id == command_id) {
       return FlipIndex(static_cast<int>(std::distance(items_.begin(), i)));
     }
   }
   return -1;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMenuModel, MenuModel implementation:
 
 bool SimpleMenuModel::HasIcons() const {
   for (ItemVector::const_iterator i = items_.begin(); i != items_.end(); ++i) {
-    if (!i->icon.isNull())
+    if (!i->icon.IsEmpty())
       return true;
   }
 
   return false;
 }
 
 int SimpleMenuModel::GetItemCount() const {
   return static_cast<int>(items_.size());
 }
 
@@ skipping 31 matching lines @@
     return false;
   MenuModel::ItemType item_type = GetTypeAt(index);
   return (item_type == TYPE_CHECK || item_type == TYPE_RADIO) ?
       delegate_->IsCommandIdChecked(GetCommandIdAt(index)) : false;
 }
 
 int SimpleMenuModel::GetGroupIdAt(int index) const {
   return items_[ValidateItemIndex(FlipIndex(index))].group_id;
 }
 
-bool SimpleMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) {
+bool SimpleMenuModel::GetIconAt(int index, gfx::Image* icon) {
   if (IsItemDynamicAt(index))
     return delegate_->GetIconForCommandId(GetCommandIdAt(index), icon);
 
   ValidateItemIndex(index);
-  if (items_[index].icon.isNull())
+  if (items_[index].icon.IsEmpty())
     return false;
 
   *icon = items_[index].icon;
   return true;
 }
 
 ButtonMenuItemModel* SimpleMenuModel::GetButtonMenuItemAt(int index) const {
   return items_[ValidateItemIndex(FlipIndex(index))].button_model;
 }
 
@@ skipping 81 matching lines @@
 #ifndef NDEBUG
   if (item.type == TYPE_SEPARATOR) {
     DCHECK_EQ(item.command_id, kSeparatorId);
   } else {
     DCHECK_GE(item.command_id, 0);
   }
 #endif  // NDEBUG
 }
 
 }  // namespace ui