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

ui/views/controls/button/text_button.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_BUTTON_TEXT_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #pragma once
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/string16.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"

[msw, 2012/05/29 07:50:51]

nit: alphabetize.

 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/native_theme_delegate.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 13 matching lines @@
   virtual ~TextButtonBorder();
 
   // By default BS_NORMAL is drawn with no border.  Call this to instead draw it
   // with the same border as the "hot" state.
   // TODO(pkasting): You should also call set_animate_on_state_change(false) on
   // the button in this case... we should fix this.
   void copy_normal_set_to_hot_set() { set_normal_set(hot_set_); }
 
  protected:
   struct BorderImageSet {
-    const SkBitmap* top_left;
-    const SkBitmap* top;
-    const SkBitmap* top_right;
-    const SkBitmap* left;
-    const SkBitmap* center;
-    const SkBitmap* right;
-    const SkBitmap* bottom_left;
-    const SkBitmap* bottom;
-    const SkBitmap* bottom_right;
+    const gfx::ImageSkia* top_left;
+    const gfx::ImageSkia* top;
+    const gfx::ImageSkia* top_right;
+    const gfx::ImageSkia* left;
+    const gfx::ImageSkia* center;
+    const gfx::ImageSkia* right;
+    const gfx::ImageSkia* bottom_left;
+    const gfx::ImageSkia* bottom;
+    const gfx::ImageSkia* bottom_right;
   };
 
   void Paint(const View& view,
              gfx::Canvas* canvas,
              const BorderImageSet& set) const;
 
   void set_normal_set(const BorderImageSet& set) { normal_set_ = set; }
   void set_hot_set(const BorderImageSet& set) { hot_set_ = set; }
   void set_pushed_set(const BorderImageSet& set) { pushed_set_ = set; }
   void set_vertical_padding(int vertical_padding) {
@@ skipping 247 matching lines @@
   static const char kViewClassName[];
 
   TextButton(ButtonListener* listener, const string16& text);
   virtual ~TextButton();
 
   void set_icon_text_spacing(int icon_text_spacing) {
     icon_text_spacing_ = icon_text_spacing;
   }
 
   // Sets the icon.
-  virtual void SetIcon(const SkBitmap& icon);
-  virtual void SetHoverIcon(const SkBitmap& icon);
-  virtual void SetPushedIcon(const SkBitmap& icon);
+  virtual void SetIcon(const gfx::ImageSkia& icon);
+  virtual void SetHoverIcon(const gfx::ImageSkia& icon);
+  virtual void SetPushedIcon(const gfx::ImageSkia& icon);
 
   bool HasIcon() const { return !icon_.empty(); }
 
   // Meanings are reversed for right-to-left layouts.
   enum IconPlacement {
     ICON_ON_LEFT,
     ICON_ON_RIGHT
   };
 
   IconPlacement icon_placement() { return icon_placement_; }
   void set_icon_placement(IconPlacement icon_placement) {
     icon_placement_ = icon_placement;
   }
 
   void set_ignore_minimum_size(bool ignore_minimum_size);
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE;
   virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
 
   // Overridden from TextButtonBase:
   virtual void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) OVERRIDE;
 
  protected:
-  SkBitmap icon() const { return icon_; }
+  gfx::ImageSkia icon() const { return icon_; }
 
-  virtual const SkBitmap& GetImageToPaint() const;
+  virtual const gfx::ImageSkia& GetImageToPaint() const;
 
   // Overridden from NativeThemeDelegate:
   virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE;
 
   // Overridden from TextButtonBase:
   virtual void GetExtraParams(
       ui::NativeTheme::ExtraParams* params) const OVERRIDE;
   virtual gfx::Rect GetTextBounds() const OVERRIDE;
 
  private:
   // The position of the icon.
   IconPlacement icon_placement_;
 
   // An icon displayed with the text.
-  SkBitmap icon_;
+  gfx::ImageSkia icon_;
 
   // An optional different version of the icon for hover state.
-  SkBitmap icon_hover_;
+  gfx::ImageSkia icon_hover_;
   bool has_hover_icon_;
 
   // An optional different version of the icon for pushed state.
-  SkBitmap icon_pushed_;
+  gfx::ImageSkia icon_pushed_;
   bool has_pushed_icon_;
 
   // Space between icon and text.
   int icon_text_spacing_;
 
   // True if the button should ignore the minimum size for the platform. Default
   // is true. Set to false to prevent narrower buttons.
   bool ignore_minimum_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TextButton);
@@ skipping 28 matching lines @@
   // Overridden from TextButton:
   virtual void GetExtraParams(
       ui::NativeTheme::ExtraParams* params) const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_