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

ui/views/controls/menu/menu_item_view.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_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "build/build_config.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/views/view.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 
 #include "ui/base/native_theme/native_theme.h"
 #endif
 
 namespace gfx {
 class Font;
@@ skipping 100 matching lines @@
       const string16& item_text, const string16& accelerator_text);
 
   // Hides and cancels the menu. This does nothing if the menu is not open.
   void Cancel();
 
   // Add an item to the menu at a specified index.  ChildrenChanged() should
   // called after adding menu items if the menu may be active.
   MenuItemView* AddMenuItemAt(int index,
                               int item_id,
                               const string16& label,
-                              const SkBitmap& icon,
+                              const gfx::ImageSkia& icon,
                               Type type);
 
   // Remove an item from the menu at a specified index.
   // ChildrenChanged() should be called after removing menu items (whether
   // the menu may be active or not).
   void RemoveMenuItemAt(int index);
 
   // Appends an item to this menu.
   // item_id    The id of the item, used to identify it in delegate callbacks
   //            or (if delegate is NULL) to identify the command associated
   //            with this item with the controller specified in the ctor. Note
   //            that this value should not be 0 as this has a special meaning
   //            ("NULL command, no item selected")
   // label      The text label shown.
   // type       The type of item.
   MenuItemView* AppendMenuItem(int item_id,
                                const string16& label,
                                Type type);
 
   // Append a submenu to this menu.
   // The returned pointer is owned by this menu.
   MenuItemView* AppendSubMenu(int item_id,
                               const string16& label);
 
   // Append a submenu with an icon to this menu.
   // The returned pointer is owned by this menu.
   MenuItemView* AppendSubMenuWithIcon(int item_id,
                                       const string16& label,
-                                      const SkBitmap& icon);
+                                      const gfx::ImageSkia& icon);
 
   // This is a convenience for standard text label menu items where the label
   // is provided with this call.
   MenuItemView* AppendMenuItemWithLabel(int item_id,
                                         const string16& label);
 
   // This is a convenience for text label menu items where the label is
   // provided by the delegate.
   MenuItemView* AppendDelegateMenuItem(int item_id);
 
   // Adds a separator to this menu
   void AppendSeparator();
 
   // Appends a menu item with an icon. This is for the menu item which
   // needs an icon. Calling this function forces the Menu class to draw
   // the menu, instead of relying on Windows.
   MenuItemView* AppendMenuItemWithIcon(int item_id,
                                        const string16& label,
-                                       const SkBitmap& icon);
+                                       const gfx::ImageSkia& icon);
 
   // Creates a menu item for the specified entry in the model and appends it as
   // a child. |index| should be offset by GetFirstItemIndex() before calling
   // this function.
   MenuItemView* AppendMenuItemFromModel(ui::MenuModel* model,
                                         int index,
                                         int id);
 
   // All the AppendXXX methods funnel into this.
   MenuItemView* AppendMenuItemImpl(int item_id,
                                    const string16& label,
-                                   const SkBitmap& icon,
+                                   const gfx::ImageSkia& icon,
                                    Type type);
 
   // Returns the view that contains child menu items. If the submenu has
   // not been creates, this creates it.
   virtual SubmenuView* CreateSubmenu();
 
   // Returns true if this menu item has a submenu.
   virtual bool HasSubmenu() const;
 
   // Returns the view containing child menu items.
@@ skipping 19 matching lines @@
   // the mouse around the menu while open.
   void SetSelected(bool selected);
 
   // Returns true if the item is selected.
   bool IsSelected() const { return selected_; }
 
   // Sets the |tooltip| for a menu item view with |item_id| identifier.
   void SetTooltip(const string16& tooltip, int item_id);
 
   // Sets the icon for the descendant identified by item_id.
-  void SetIcon(const SkBitmap& icon, int item_id);
+  void SetIcon(const gfx::ImageSkia& icon, int item_id);
 
   // Sets the icon of this menu item.
-  void SetIcon(const SkBitmap& icon);
+  void SetIcon(const gfx::ImageSkia& icon);
 
   // Returns the icon.
-  const SkBitmap& GetIcon() const { return icon_; }
+  const gfx::ImageSkia& GetIcon() const { return icon_; }
 
   // Sets the command id of this menu item.
   void SetCommand(int command) { command_ = command; }
 
   // Returns the command id of this item.
   int GetCommand() const { return command_; }
 
   // Paints the menu item.
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
@@ skipping 175 matching lines @@
   // Command id.
   int command_;
 
   // Submenu, created via CreateSubmenu.
   SubmenuView* submenu_;
 
   // Title.
   string16 title_;
 
   // Icon.
-  SkBitmap icon_;
+  gfx::ImageSkia icon_;
 
   // Does the title have a mnemonic? Only useful on the root menu item.
   bool has_mnemonics_;
 
   // Should we show the mnemonic? Mnemonics are shown if this is true or
   // MenuConfig says mnemonics should be shown. Only used on the root menu item.
   bool show_mnemonics_;
 
   bool has_icons_;
 
@@ skipping 29 matching lines @@
   // If set to false, the right margin will be removed for menu lines
   // containing other elements.
   bool use_right_margin_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_