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

ui/base/models/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_MENU_MODEL_H_
 #define UI_BASE_MODELS_MENU_MODEL_H_
 #pragma once
 
 #include "base/string16.h"
 #include "ui/base/models/menu_model_delegate.h"
 #include "ui/base/ui_export.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 
-class SkBitmap;
 
 namespace gfx {
 class Font;
+class ImageSkia;
 }
 
 namespace ui {
 
 class Accelerator;
 class ButtonMenuItemModel;
 
 // An interface implemented by an object that provides the content of a menu.
 class UI_EXPORT MenuModel {
  public:
@@ skipping 52 matching lines @@
 
   // Returns the checked state of the item at the specified index.
   virtual bool IsItemCheckedAt(int index) const = 0;
 
   // Returns the id of the group of radio items that the item at the specified
   // index belongs to.
   virtual int GetGroupIdAt(int index) const = 0;
 
   // Gets the icon for the item at the specified index, returning true if there
   // is an icon, false otherwise.
-  virtual bool GetIconAt(int index, SkBitmap* icon) = 0;
+  virtual bool GetIconAt(int index, gfx::ImageSkia* icon) = 0;
 
   // Returns the model for a menu item with a line of buttons at |index|.
   virtual ButtonMenuItemModel* GetButtonMenuItemAt(int index) const = 0;
 
   // Returns the enabled state of the item at the specified index.
   virtual bool IsEnabledAt(int index) const = 0;
 
   // Returns true if the menu item is visible.
   virtual bool IsVisibleAt(int index) const;
 
@@ skipping 24 matching lines @@
   // Retrieves the model and index that contains a specific command id. Returns
   // true if an item with the specified command id is found. |model| is inout,
   // and specifies the model to start searching from.
   static bool GetModelAndIndexForCommandId(int command_id, MenuModel** model,
                                            int* index);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_MODELS_MENU_MODEL_H_