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

ui/views/controls/button/image_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_IMAGE_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
 #pragma once
 
 #include "base/gtest_prod_util.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/custom_button.h"
 
 namespace views {
 
 // An image button.
 
 // Note that this type of button is not focusable by default and will not be
 // part of the focus chain.  Call set_focusable(true) to make it part of the
 // focus chain.
@@ skipping 18 matching lines @@
   // Set the image the button should use for the provided state.
   virtual void SetImage(ButtonState state, const gfx::ImageSkia* image);
 
   // Set the background details.
   void SetBackground(SkColor color,
                      const gfx::ImageSkia* image,
                      const gfx::ImageSkia* mask);
 
   // Set an |image| to draw on top of the normal / hot / pushed image.
   // Pass NULL for no image.
-  void SetOverlayImage(const SkBitmap* image);
+  void SetOverlayImage(const gfx::ImageSkia* image);
 
   // Sets how the image is laid out within the button's bounds.
   void SetImageAlignment(HorizontalAlignment h_align,
                          VerticalAlignment v_align);
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   // Sets preferred size, so it could be correctly positioned in layout even if
   // it is NULL.
   void SetPreferredSize(const gfx::Size& preferred_size) {
     preferred_size_ = preferred_size;
   }
 
  protected:
   // Returns the image to paint. This is invoked from paint and returns a value
   // from images.
-  virtual SkBitmap GetImageToPaint();
+  virtual gfx::ImageSkia GetImageToPaint();
 
   // The images used to render the different states of this button.
-  SkBitmap images_[BS_COUNT];
+  gfx::ImageSkia images_[BS_COUNT];
 
   // The background image.
-  SkBitmap background_image_;
+  gfx::ImageSkia background_image_;
 
   // Image to draw on top of normal / hot / pushed image.  Usually empty.
-  SkBitmap overlay_image_;
+  gfx::ImageSkia overlay_image_;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ImageButtonTest, Basics);
 
   // Image alignment.
   HorizontalAlignment h_alignment_;
   VerticalAlignment v_alignment_;
   gfx::Size preferred_size_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageButton);
@@ skipping 27 matching lines @@
                         const gfx::ImageSkia* image) OVERRIDE;
 
   // Overridden from View:
   virtual bool GetTooltipText(const gfx::Point& p,
                               string16* tooltip) const OVERRIDE;
 
  private:
   // The parent class's images_ member is used for the current images,
   // and this array is used to hold the alternative images.
   // We swap between the two when toggling.
-  SkBitmap alternate_images_[BS_COUNT];
+  gfx::ImageSkia alternate_images_[BS_COUNT];
 
   // True if the button is currently toggled.
   bool toggled_;
 
   // The parent class's tooltip_text_ is displayed when not toggled, and
   // this one is shown when toggled.
   string16 toggled_tooltip_text_;
 
   DISALLOW_COPY_AND_ASSIGN(ToggleImageButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_