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

ui/views/window/custom_frame_view.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/custom_frame_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 300 matching lines @@
       unavailable_px_at_top - size - TitlebarBottomThickness() + 1) / 2;
   return gfx::Rect(frame_thickness + kIconLeftSpacing, y, size, size);
 }
 
 bool CustomFrameView::ShouldShowClientEdge() const {
   return !frame_->IsMaximized();
 }
 
 void CustomFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
   frame_background_->set_frame_color(GetFrameColor());
-  const SkBitmap* frame_image = GetFrameBitmap();
-  frame_background_->set_theme_bitmap(frame_image);
+  const gfx::ImageSkia* frame_image = GetFrameImage();
+  frame_background_->set_theme_image(frame_image);
   frame_background_->set_top_area_height(frame_image->height());
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   frame_background_->SetCornerImages(
-      rb.GetImageNamed(IDR_WINDOW_TOP_LEFT_CORNER).ToSkBitmap(),
-      rb.GetImageNamed(IDR_WINDOW_TOP_RIGHT_CORNER).ToSkBitmap(),
-      rb.GetImageNamed(IDR_WINDOW_BOTTOM_LEFT_CORNER).ToSkBitmap(),
-      rb.GetImageNamed(IDR_WINDOW_BOTTOM_RIGHT_CORNER).ToSkBitmap());
+      rb.GetImageNamed(IDR_WINDOW_TOP_LEFT_CORNER).ToImageSkia(),
+      rb.GetImageNamed(IDR_WINDOW_TOP_RIGHT_CORNER).ToImageSkia(),
+      rb.GetImageNamed(IDR_WINDOW_BOTTOM_LEFT_CORNER).ToImageSkia(),
+      rb.GetImageNamed(IDR_WINDOW_BOTTOM_RIGHT_CORNER).ToImageSkia());
   frame_background_->SetSideImages(
-      rb.GetImageNamed(IDR_WINDOW_LEFT_SIDE).ToSkBitmap(),
-      rb.GetImageNamed(IDR_WINDOW_TOP_CENTER).ToSkBitmap(),
-      rb.GetImageNamed(IDR_WINDOW_RIGHT_SIDE).ToSkBitmap(),
-      rb.GetImageNamed(IDR_WINDOW_BOTTOM_CENTER).ToSkBitmap());
+      rb.GetImageNamed(IDR_WINDOW_LEFT_SIDE).ToImageSkia(),
+      rb.GetImageNamed(IDR_WINDOW_TOP_CENTER).ToImageSkia(),
+      rb.GetImageNamed(IDR_WINDOW_RIGHT_SIDE).ToImageSkia(),
+      rb.GetImageNamed(IDR_WINDOW_BOTTOM_CENTER).ToImageSkia());
 
   frame_background_->PaintRestored(canvas, this);
 }
 
 void CustomFrameView::PaintMaximizedFrameBorder(gfx::Canvas* canvas) {
-  const SkBitmap* frame_image = GetFrameBitmap();
-  frame_background_->set_theme_bitmap(frame_image);
+  const gfx::ImageSkia* frame_image = GetFrameImage();
+  frame_background_->set_theme_image(frame_image);
   frame_background_->set_top_area_height(frame_image->height());
   frame_background_->PaintMaximized(canvas, this);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   // TODO(jamescook): Migrate this into FrameBackground.
   // The bottom of the titlebar actually comes from the top of the Client Edge
   // graphic, with the actual client edge clipped off the bottom.
-  const SkBitmap* titlebar_bottom = rb.GetImageNamed(
-      IDR_APP_TOP_CENTER).ToSkBitmap();
+  const gfx::ImageSkia* titlebar_bottom = rb.GetImageNamed(
+      IDR_APP_TOP_CENTER).ToImageSkia();
   int edge_height = titlebar_bottom->height() -
       (ShouldShowClientEdge() ? kClientEdgeThickness : 0);
   canvas->TileImageInt(*titlebar_bottom, 0,
       frame_->client_view()->y() - edge_height, width(), edge_height);
 }
 
 void CustomFrameView::PaintTitleBar(gfx::Canvas* canvas) {
   WidgetDelegate* delegate = frame_->widget_delegate();
 
   // It seems like in some conditions we can be asked to paint after the window
   // that contains us is WM_DESTROYed. At this point, our delegate is NULL. The
   // correct long term fix may be to shut down the RootView in WM_DESTROY.
   if (!delegate)
     return;
 
   canvas->DrawStringInt(delegate->GetWindowTitle(), GetTitleFont(),
                         SK_ColorWHITE, GetMirroredXForRect(title_bounds_),
                         title_bounds_.y(), title_bounds_.width(),
                         title_bounds_.height());
 }
 
 void CustomFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
   gfx::Rect client_area_bounds = frame_->client_view()->bounds();
   int client_area_top = client_area_bounds.y();
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  const SkBitmap* top_left = rb.GetImageNamed(IDR_APP_TOP_LEFT).ToSkBitmap();
-  const SkBitmap* top = rb.GetImageNamed(IDR_APP_TOP_CENTER).ToSkBitmap();
-  const SkBitmap* top_right = rb.GetImageNamed(IDR_APP_TOP_RIGHT).ToSkBitmap();
-  const SkBitmap* right = rb.GetImageNamed(IDR_CONTENT_RIGHT_SIDE).ToSkBitmap();
-  const SkBitmap* bottom_right = rb.GetImageNamed(
-      IDR_CONTENT_BOTTOM_RIGHT_CORNER).ToSkBitmap();
-  const SkBitmap* bottom = rb.GetImageNamed(
-      IDR_CONTENT_BOTTOM_CENTER).ToSkBitmap();
-  const SkBitmap* bottom_left = rb.GetImageNamed(
-      IDR_CONTENT_BOTTOM_LEFT_CORNER).ToSkBitmap();
-  const SkBitmap* left = rb.GetImageNamed(IDR_CONTENT_LEFT_SIDE).ToSkBitmap();
+  const gfx::ImageSkia* top_left = rb.GetImageNamed(
+      IDR_APP_TOP_LEFT).ToImageSkia();
+  const gfx::ImageSkia* top = rb.GetImageNamed(
+      IDR_APP_TOP_CENTER).ToImageSkia();
+  const gfx::ImageSkia* top_right = rb.GetImageNamed(
+      IDR_APP_TOP_RIGHT).ToImageSkia();
+  const gfx::ImageSkia* right = rb.GetImageNamed(
+      IDR_CONTENT_RIGHT_SIDE).ToImageSkia();
+  const gfx::ImageSkia* bottom_right = rb.GetImageNamed(
+      IDR_CONTENT_BOTTOM_RIGHT_CORNER).ToImageSkia();
+  const gfx::ImageSkia* bottom = rb.GetImageNamed(
+      IDR_CONTENT_BOTTOM_CENTER).ToImageSkia();
+  const gfx::ImageSkia* bottom_left = rb.GetImageNamed(
+      IDR_CONTENT_BOTTOM_LEFT_CORNER).ToImageSkia();
+  const gfx::ImageSkia* left = rb.GetImageNamed(
+      IDR_CONTENT_LEFT_SIDE).ToImageSkia();
 
   // Top.
   int top_edge_y = client_area_top - top->height();
   canvas->DrawBitmapInt(*top_left, client_area_bounds.x() - top_left->width(),
                         top_edge_y);
   canvas->TileImageInt(*top, client_area_bounds.x(), top_edge_y,
                        client_area_bounds.width(), top->height());
   canvas->DrawBitmapInt(*top_right, client_area_bounds.right(), top_edge_y);
 
   // Right.
@@ skipping 18 matching lines @@
   // Draw the color to fill in the edges.
   canvas->FillRect(gfx::Rect(client_area_bounds.x() - 1, client_area_top - 1,
       client_area_bounds.width() + 1, client_area_bottom - client_area_top + 1),
       kClientEdgeColor);
 }
 
 SkColor CustomFrameView::GetFrameColor() const {
   return frame_->IsActive() ? kDefaultColorFrame : kDefaultColorFrameInactive;
 }
 
-const SkBitmap* CustomFrameView::GetFrameBitmap() const {
+const gfx::ImageSkia* CustomFrameView::GetFrameImage() const {
   return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      frame_->IsActive() ? IDR_FRAME : IDR_FRAME_INACTIVE).ToSkBitmap();
+      frame_->IsActive() ? IDR_FRAME : IDR_FRAME_INACTIVE).ToImageSkia();
 }
 
 void CustomFrameView::LayoutWindowControls() {
   close_button_->SetImageAlignment(ImageButton::ALIGN_LEFT,
                                    ImageButton::ALIGN_BOTTOM);
   int caption_y = CaptionButtonY();
   bool is_maximized = frame_->IsMaximized();
   // There should always be the same number of non-shadow pixels visible to the
   // side of the caption buttons.  In maximized mode we extend the rightmost
   // button to the screen corner to obey Fitts' Law.
   int right_extra_width = is_maximized ?
       (kFrameBorderThickness - kFrameShadowThickness) : 0;
   gfx::Size close_button_size = close_button_->GetPreferredSize();
   close_button_->SetBounds(width() - FrameBorderThickness() -
       right_extra_width - close_button_size.width(), caption_y,
       close_button_size.width() + right_extra_width,
       close_button_size.height());
 
   // When the window is restored, we show a maximized button; otherwise, we show
   // a restore button.
   bool is_restored = !is_maximized && !frame_->IsMinimized();
   ImageButton* invisible_button = is_restored ? restore_button_
                                               : maximize_button_;
   invisible_button->SetVisible(false);
 
   ImageButton* visible_button = is_restored ? maximize_button_
                                             : restore_button_;
-  FramePartBitmap normal_part, hot_part, pushed_part;
+  FramePartImage normal_part, hot_part, pushed_part;
   if (should_show_minmax_buttons_) {
     visible_button->SetVisible(true);
     visible_button->SetImageAlignment(ImageButton::ALIGN_LEFT,
                                       ImageButton::ALIGN_BOTTOM);
     gfx::Size visible_button_size = visible_button->GetPreferredSize();
     visible_button->SetBounds(close_button_->x() - visible_button_size.width(),
                               caption_y, visible_button_size.width(),
                               visible_button_size.height());
 
     minimize_button_->SetVisible(true);
@@ skipping 71 matching lines @@
                    rb.GetImageNamed(normal_image_id).ToImageSkia());
   button->SetImage(CustomButton::BS_HOT,
                    rb.GetImageNamed(hot_image_id).ToImageSkia());
   button->SetImage(CustomButton::BS_PUSHED,
                    rb.GetImageNamed(pushed_image_id).ToImageSkia());
   AddChildView(button);
   return button;
 }
 
 }  // namespace views