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

ui/views/controls/menu/menu_image_util.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_image_util.h"
 
 #include "base/i18n/rtl.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
 namespace {
 
 // Size of the radio button inciator.
 const int kSelectedIndicatorSize = 5;
 const int kIndicatorSize = 10;
 
 // Used for the radio indicator. See theme_draw for details.
 const double kGradientStop = .5;
 const SkColor kGradient0 = SkColorSetRGB(255, 255, 255);
 const SkColor kGradient1 = SkColorSetRGB(255, 255, 255);
 const SkColor kGradient2 = SkColorSetRGB(0xD8, 0xD8, 0xD8);
 const SkColor kBaseStroke = SkColorSetRGB(0x8F, 0x8F, 0x8F);
 const SkColor kRadioButtonIndicatorGradient0 = SkColorSetRGB(0, 0, 0);
 const SkColor kRadioButtonIndicatorGradient1 = SkColorSetRGB(0x83, 0x83, 0x83);
 const SkColor kIndicatorStroke = SkColorSetRGB(0, 0, 0);
 
-SkBitmap* CreateRadioButtonImage(bool selected) {
+gfx::ImageSkia* CreateRadioButtonImage(bool selected) {
   // + 2 (1px on each side) to cover rounding error.
   gfx::Canvas canvas(gfx::Size(kIndicatorSize + 2, kIndicatorSize + 2), false);
   canvas.Translate(gfx::Point(1, 1));
 
   SkPoint gradient_points[3];
   gradient_points[0].iset(0, 0);
   gradient_points[1].iset(0, static_cast<int>(kIndicatorSize * kGradientStop));
   gradient_points[2].iset(0, kIndicatorSize);
   SkColor gradient_colors[3] = { kGradient0, kGradient1, kGradient2 };
   SkShader* shader = SkGradientShader::CreateLinear(
@@ skipping 28 matching lines @@
     canvas.sk_canvas()->drawCircle(radius, radius,
                                    kSelectedIndicatorSize / 2, paint);
 
     paint.setStrokeWidth(SkIntToScalar(0));
     paint.setShader(NULL);
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setColor(kIndicatorStroke);
     canvas.sk_canvas()->drawCircle(radius, radius,
                                    kSelectedIndicatorSize / 2, paint);
   }
-  return new SkBitmap(canvas.ExtractBitmap());
+  return new gfx::ImageSkia(canvas.ExtractBitmap());
 }
 
-SkBitmap* GetRtlSubmenuArrowImage() {
-  static SkBitmap* kRtlArrow = NULL;
+gfx::ImageSkia* GetRtlSubmenuArrowImage() {
+  static gfx::ImageSkia* kRtlArrow = NULL;
   if (!kRtlArrow) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    const SkBitmap* r = rb.GetImageNamed(IDR_MENU_ARROW).ToSkBitmap();
+    const gfx::ImageSkia* r = rb.GetImageNamed(IDR_MENU_ARROW).ToImageSkia();
     gfx::Canvas canvas(gfx::Size(r->width(), r->height()), false);
     canvas.Scale(-1, 1);
     canvas.DrawBitmapInt(*r, - r->width(), 0);
-    kRtlArrow = new SkBitmap(canvas.ExtractBitmap());
+    kRtlArrow = new gfx::ImageSkia(canvas.ExtractBitmap());
   }
   return kRtlArrow;
 }
 
 }  // namespace
 
 namespace views {
 
-const SkBitmap* GetRadioButtonImage(bool selected) {
-  static const SkBitmap* kRadioOn = CreateRadioButtonImage(true);
-  static const SkBitmap* kRadioOff = CreateRadioButtonImage(false);
+const gfx::ImageSkia* GetRadioButtonImage(bool selected) {
+  static const gfx::ImageSkia* kRadioOn = CreateRadioButtonImage(true);
+  static const gfx::ImageSkia* kRadioOff = CreateRadioButtonImage(false);
 
   return selected ? kRadioOn : kRadioOff;
 }
 
-const SkBitmap* GetSubmenuArrowImage() {
+const gfx::ImageSkia* GetSubmenuArrowImage() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return base::i18n::IsRTL() ? GetRtlSubmenuArrowImage()
-                             : rb.GetImageNamed(IDR_MENU_ARROW).ToSkBitmap();
+                             : rb.GetImageNamed(IDR_MENU_ARROW).ToImageSkia();
 }
 
 }  // namespace views