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

ui/base/models/simple_menu_model.h

 // 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.
 
 #ifndef UI_BASE_MODELS_SIMPLE_MENU_MODEL_H_
 #define UI_BASE_MODELS_SIMPLE_MENU_MODEL_H_
 
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "ui/base/models/menu_model.h"
 
 namespace gfx {
-class ImageSkia;
+class Image;
 }
 
 namespace ui {
 
 class ButtonMenuItemModel;
 
 // A simple MenuModel implementation with an imperative API for adding menu
 // items. This makes it easy to construct fixed menus. Menus populated by
 // dynamic data sources may be better off implementing MenuModel directly.
 // The breadth of MenuModel is not exposed through this API.
@@ skipping 11 matching lines @@
     virtual bool GetAcceleratorForCommandId(
         int command_id,
         ui::Accelerator* accelerator) = 0;
 
     // Some command ids have labels and icons that change over time.
     virtual bool IsItemForCommandIdDynamic(int command_id) const;
     virtual string16 GetLabelForCommandId(int command_id) const;
     // Gets the icon for the item with the specified id, returning true if there
     // is an icon, false otherwise.
     virtual bool GetIconForCommandId(int command_id,
-                                     gfx::ImageSkia* icon) const;
+                                     gfx::Image* icon) const;
 
     // Notifies the delegate that the item with the specified command id was
     // visually highlighted within the menu.
     virtual void CommandIdHighlighted(int command_id);
 
     // Performs the action associated with the specified command id.
     virtual void ExecuteCommand(int command_id) = 0;
     // Performs the action associates with the specified command id
     // with |event_flags|.
     virtual void ExecuteCommand(int command_id, int event_flags);
@@ skipping 37 matching lines @@
   void InsertRadioItemAt(
       int index, int command_id, const string16& label, int group_id);
   void InsertRadioItemWithStringIdAt(
       int index, int command_id, int string_id, int group_id);
   void InsertSubMenuAt(
       int index, int command_id, const string16& label, MenuModel* model);
   void InsertSubMenuWithStringIdAt(
       int index, int command_id, int string_id, MenuModel* model);
 
   // Sets the icon for the item at |index|.
-  void SetIcon(int index, const gfx::ImageSkia& icon);
+  void SetIcon(int index, const gfx::Image& icon);
 
   // Clears all items. Note that it does not free MenuModel of submenu.
   void Clear();
 
   // Returns the index of the item that has the given |command_id|. Returns
   // -1 if not found.
   int GetIndexOfCommandId(int command_id);
 
   // Overridden from MenuModel:
   virtual bool HasIcons() const OVERRIDE;
   virtual int GetItemCount() const OVERRIDE;
   virtual ItemType GetTypeAt(int index) const OVERRIDE;
   virtual int GetCommandIdAt(int index) const OVERRIDE;
   virtual string16 GetLabelAt(int index) const OVERRIDE;
   virtual bool IsItemDynamicAt(int index) const OVERRIDE;
   virtual bool GetAcceleratorAt(int index,
                                 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;
   virtual bool IsVisibleAt(int index) const OVERRIDE;
   virtual void HighlightChangedTo(int index) OVERRIDE;
   virtual void ActivatedAt(int index) OVERRIDE;
   virtual void ActivatedAt(int index, int event_flags) OVERRIDE;
   virtual MenuModel* GetSubmenuModelAt(int index) const OVERRIDE;
   virtual void MenuWillShow() OVERRIDE;
   virtual void MenuClosed() OVERRIDE;
@@ skipping 36 matching lines @@
   MenuModelDelegate* menu_model_delegate_;
 
   base::WeakPtrFactory<SimpleMenuModel> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleMenuModel);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_MODELS_SIMPLE_MENU_MODEL_H_