Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia

ui/views/painter.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/painter.h"
 
 #include "base/logging.h"
-#include "third_party/skia/include/core/SkBitmap.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/insets.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
 namespace views {
 
 namespace {
 
 class GradientPainter : public Painter {
  public:
@@ skipping 31 matching lines @@
  private:
   bool horizontal_;
   SkColor colors_[2];
 
   DISALLOW_COPY_AND_ASSIGN(GradientPainter);
 };
 
 
 class ImagePainter : public Painter {
  public:
-  ImagePainter(const SkBitmap& image,
+  ImagePainter(const gfx::ImageSkia& image,
                const gfx::Insets& insets,
                bool paint_center)
       : image_(image),
         insets_(insets),
         paint_center_(paint_center) {
     DCHECK(image.width() > insets.width() &&
            image.height() > insets.height());
   }
 
   // Paints the images.
@@ skipping 59 matching lines @@
           image_,
           insets_.left(), insets_.top(),
           image_.width() - insets_.width(), image_.height() - insets_.height(),
           insets_.left(), insets_.top(),
           size.width() - insets_.width(), size.height() - insets_.height(),
           true);
     }
   }
 
  private:
-  const SkBitmap image_;
+  const gfx::ImageSkia image_;
   const gfx::Insets insets_;
   bool paint_center_;
 
   DISALLOW_COPY_AND_ASSIGN(ImagePainter);
 };
 
 }  // namespace
 
 // static
 void Painter::PaintPainterAt(gfx::Canvas* canvas,
@@ skipping 10 matching lines @@
 Painter* Painter::CreateHorizontalGradient(SkColor c1, SkColor c2) {
   return new GradientPainter(true, c1, c2);
 }
 
 // static
 Painter* Painter::CreateVerticalGradient(SkColor c1, SkColor c2) {
   return new GradientPainter(false, c1, c2);
 }
 
 // static
-Painter* Painter::CreateImagePainter(const SkBitmap& image,
+Painter* Painter::CreateImagePainter(const gfx::ImageSkia& image,
                                      const gfx::Insets& insets,
                                      bool paint_center) {
   return new ImagePainter(image, insets, paint_center);
 }
 
 HorizontalPainter::HorizontalPainter(const int image_resource_names[]) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   for (int i = 0; i < 3; ++i)
-    images_[i] = rb.GetImageNamed(image_resource_names[i]).ToSkBitmap();
+    images_[i] = rb.GetImageNamed(image_resource_names[i]).ToImageSkia();
   height_ = images_[LEFT]->height();
   DCHECK(images_[LEFT]->height() == images_[RIGHT]->height() &&
          images_[LEFT]->height() == images_[CENTER]->height());
 }
 
 void HorizontalPainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
   if (size.width() < (images_[LEFT]->width() + images_[CENTER]->width() +
       images_[RIGHT]->width())) {
     // No room to paint.
     return;
   }
   canvas->DrawBitmapInt(*images_[LEFT], 0, 0);
   canvas->DrawBitmapInt(*images_[RIGHT],
                         size.width() - images_[RIGHT]->width(), 0);
   canvas->TileImageInt(*images_[CENTER], images_[LEFT]->width(), 0,
       size.width() - images_[LEFT]->width() - images_[RIGHT]->width(), height_);
 }
 
 }  // namespace views