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

ui/views/controls/glow_hover_controller.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/glow_hover_controller.h"
 
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 // Amount to scale the opacity.
 static const double kOpacityScale = 0.5;
 
 // How long the hover state takes.
 static const int kHoverDurationMs = 400;
@@ skipping 37 matching lines @@
 
 double GlowHoverController::GetAnimationValue() const {
   return animation_.GetCurrentValue();
 }
 
 bool GlowHoverController::ShouldDraw() const {
   return animation_.IsShowing() || animation_.is_animating();
 }
 
 void GlowHoverController::Draw(gfx::Canvas* canvas,
-                               const SkBitmap& mask_image) const {
+                               const gfx::ImageSkia& mask_image) const {
   if (!ShouldDraw())
     return;
 
   // Draw a radial gradient to hover_canvas.
   gfx::Canvas hover_canvas(gfx::Size(mask_image.width(), mask_image.height()),
                            false);
 
   // Draw a radial gradient to hover_canvas.
   int radius = view_->width() / 3;
 
@@ skipping 11 matching lines @@
   if (shader) {
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setAntiAlias(true);
     paint.setShader(shader);
     shader->unref();
     hover_canvas.DrawRect(gfx::Rect(location_.x() - radius,
                                     location_.y() - radius,
                                     radius * 2, radius * 2), paint);
   }
-  SkBitmap result = SkBitmapOperations::CreateMaskedBitmap(
+  gfx::ImageSkia result = SkBitmapOperations::CreateMaskedBitmap(
       hover_canvas.ExtractBitmap(), mask_image);
   canvas->DrawBitmapInt(result, (view_->width() - mask_image.width()) / 2,
                         (view_->height() - mask_image.height()) / 2);
 }
 
 void GlowHoverController::AnimationEnded(const ui::Animation* animation) {
   view_->SchedulePaint();
 }
 
 void GlowHoverController::AnimationProgressed(const ui::Animation* animation) {
   view_->SchedulePaint();
 }
 
 }  // namespace views