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

ui/views/window/frame_background.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/window/frame_background.h"
 
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 FrameBackground::FrameBackground()
   : frame_color_(0),
-    theme_bitmap_(NULL),
-    theme_overlay_bitmap_(NULL),
+    theme_image_(NULL),
+    theme_overlay_image_(NULL),
     top_area_height_(0),
     left_edge_(NULL),
     top_edge_(NULL),
     right_edge_(NULL),
     bottom_edge_(NULL),
     top_left_corner_(NULL),
     top_right_corner_(NULL),
     bottom_left_corner_(NULL),
     bottom_right_corner_(NULL),
     maximized_top_left_(NULL),
     maximized_top_right_(NULL),
     maximized_top_offset_(0),
     theme_background_y_(0) {
 }
 
 FrameBackground::~FrameBackground() {
 }
 
-void FrameBackground::SetSideImages(const SkBitmap* left,
-                                    const SkBitmap* top,
-                                    const SkBitmap* right,
-                                    const SkBitmap* bottom) {
+void FrameBackground::SetSideImages(const gfx::ImageSkia* left,
+                                    const gfx::ImageSkia* top,
+                                    const gfx::ImageSkia* right,
+                                    const gfx::ImageSkia* bottom) {
   left_edge_ = left;
   top_edge_ = top;
   right_edge_ = right;
   bottom_edge_ = bottom;
 }
 
-void FrameBackground::SetCornerImages(const SkBitmap* top_left,
-                                      const SkBitmap* top_right,
-                                      const SkBitmap* bottom_left,
-                                      const SkBitmap* bottom_right) {
+void FrameBackground::SetCornerImages(const gfx::ImageSkia* top_left,
+                                      const gfx::ImageSkia* top_right,
+                                      const gfx::ImageSkia* bottom_left,
+                                      const gfx::ImageSkia* bottom_right) {
   top_left_corner_ = top_left;
   top_right_corner_ = top_right;
   bottom_left_corner_ = bottom_left;
   bottom_right_corner_ = bottom_right;
 }
 
 void FrameBackground::PaintRestored(gfx::Canvas* canvas, View* view) const {
   // Fill with the frame color first so we have a constant background for
   // areas not covered by the theme image.
   PaintFrameColor(canvas, view);
 
   // Draw the theme frame.
-  canvas->TileImageInt(*theme_bitmap_,
-                       0, 0, view->width(), theme_bitmap_->height());
+  canvas->TileImageInt(*theme_image_,
+                       0, 0, view->width(), theme_image_->height());
 
   // Draw the theme frame overlay, if available.
-  if (theme_overlay_bitmap_)
-    canvas->DrawBitmapInt(*theme_overlay_bitmap_, 0, 0);
+  if (theme_overlay_image_)
+    canvas->DrawBitmapInt(*theme_overlay_image_, 0, 0);
 
   // Draw the top corners and edge, scaling the corner images down if they
   // are too big and relative to the vertical space available.
   int top_left_height =
       std::min(top_left_corner_->height(),
                view->height() - bottom_left_corner_->height());
   canvas->DrawBitmapInt(*top_left_corner_,
                         0, 0, top_left_corner_->width(), top_left_height,
                         0, 0, top_left_corner_->width(), top_left_height,
                         false);
@@ skipping 42 matching lines @@
                        0, top_left_height,
                        left_edge_->width(), left_edge_height);
 }
 
 void FrameBackground::PaintMaximized(gfx::Canvas* canvas, View* view) const {
   // We will be painting from top_offset to top_offset + theme_frame_height. If
   // this is less than top_area_height_, we need to paint the frame color
   // to fill in the area beneath the image.
   // TODO(jamescook): I'm not sure this is correct, as it doesn't seem to fully
   // account for the top_offset, but this is how it worked before.
-  int theme_frame_bottom = maximized_top_offset_ + theme_bitmap_->height();
+  int theme_frame_bottom = maximized_top_offset_ + theme_image_->height();
   if (top_area_height_ > theme_frame_bottom) {
     canvas->FillRect(gfx::Rect(0, 0, view->width(), top_area_height_),
                      frame_color_);
   }
 
   int left_offset = 0;
   int right_offset = 0;
 
   // Draw top-left and top-right corners to give maximized ChromeOS windows
   // a rounded appearance.
   if (maximized_top_left_ || maximized_top_right_) {
     // If we have either a left or right we should have both.
     DCHECK(maximized_top_left_ && maximized_top_right_);
     left_offset = maximized_top_left_->width();
     right_offset = maximized_top_right_->width();
     canvas->DrawBitmapInt(*maximized_top_left_, 0, 0);
     canvas->DrawBitmapInt(*maximized_top_right_,
                           view->width() - right_offset, 0);
   }
 
   // Draw the theme frame.
-  canvas->TileImageInt(*theme_bitmap_,
+  canvas->TileImageInt(*theme_image_,
                        left_offset,
                        maximized_top_offset_,
                        view->width() - (left_offset + right_offset),
-                       theme_bitmap_->height());
+                       theme_image_->height());
   // Draw the theme frame overlay, if available.
-  if (theme_overlay_bitmap_)
-    canvas->DrawBitmapInt(*theme_overlay_bitmap_, 0, theme_background_y_);
+  if (theme_overlay_image_)
+    canvas->DrawBitmapInt(*theme_overlay_image_, 0, theme_background_y_);
 }
 
 void FrameBackground::PaintFrameColor(gfx::Canvas* canvas, View* view) const {
   // Fill the top area.
   canvas->FillRect(gfx::Rect(0, 0, view->width(), top_area_height_),
                    frame_color_);
 
   // If the window is very short, we're done.
   int remaining_height = view->height() - top_area_height_;
   if (remaining_height <= 0)
@@ skipping 13 matching lines @@
     return;
 
   // Fill the bottom area.
   canvas->FillRect(gfx::Rect(left_edge_->width(),
                              view->height() - bottom_edge_->height(),
                              center_width, bottom_edge_->height()),
                              frame_color_);
 }
 
 }  // namespace views