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

chrome/browser/ui/views/constrained_window_views.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 "chrome/browser/ui/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 45 matching lines @@
 #endif
 
 using base::TimeDelta;
 
 namespace views {
 class ClientView;
 }
 
 // An enumeration of bitmap resources used by this window.
 enum {
-  FRAME_PART_BITMAP_FIRST = 0,  // Must be first.
+  FRAME_PART_IMAGE_FIRST = 0,  // Must be first.
 
   // Window Frame Border.
   FRAME_BOTTOM_EDGE,
   FRAME_BOTTOM_LEFT_CORNER,
   FRAME_BOTTOM_RIGHT_CORNER,
   FRAME_LEFT_EDGE,
   FRAME_RIGHT_EDGE,
   FRAME_TOP_EDGE,
   FRAME_TOP_LEFT_CORNER,
   FRAME_TOP_RIGHT_CORNER,
 
-  FRAME_PART_BITMAP_COUNT  // Must be last.
+  FRAME_PART_IMAGE_COUNT  // Must be last.
 };
 
 static const int kXPFramePartIDs[] = {
     0,
     IDR_WINDOW_BOTTOM_CENTER, IDR_WINDOW_BOTTOM_LEFT_CORNER,
     IDR_WINDOW_BOTTOM_RIGHT_CORNER, IDR_WINDOW_LEFT_SIDE,
     IDR_WINDOW_RIGHT_SIDE, IDR_WINDOW_TOP_CENTER,
     IDR_WINDOW_TOP_LEFT_CORNER, IDR_WINDOW_TOP_RIGHT_CORNER,
     0 };
 static const int kVistaFramePartIDs[] = {
     0,
     IDR_CONSTRAINED_BOTTOM_CENTER_V, IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V,
     IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V, IDR_CONSTRAINED_LEFT_SIDE_V,
     IDR_CONSTRAINED_RIGHT_SIDE_V, IDR_CONSTRAINED_TOP_CENTER_V,
     IDR_CONSTRAINED_TOP_LEFT_CORNER_V, IDR_CONSTRAINED_TOP_RIGHT_CORNER_V,
     0 };
 
 class XPWindowResources : public views::WindowResources {
  public:
   XPWindowResources() {
     InitClass();
   }
   virtual ~XPWindowResources() {}
 
-  virtual SkBitmap* GetPartBitmap(views::FramePartBitmap part_id) const {
-    return bitmaps_[part_id];
+  virtual gfx::ImageSkia* GetPartImage(views::FramePartImage part_id) const {
+    return images_[part_id];
   }
 
  private:
   static void InitClass() {
     static bool initialized = false;
     if (!initialized) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-      for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i) {
+      for (int i = 0; i < FRAME_PART_IMAGE_COUNT; ++i) {
         int id = kXPFramePartIDs[i];
         if (id != 0)
-          bitmaps_[i] = rb.GetBitmapNamed(id);
+          images_[i] = rb.GetImageSkiaNamed(id);
       }
       initialized = true;
     }
   }
 
-  static SkBitmap* bitmaps_[FRAME_PART_BITMAP_COUNT];
+  static gfx::ImageSkia* images_[FRAME_PART_IMAGE_COUNT];
 
   DISALLOW_COPY_AND_ASSIGN(XPWindowResources);
 };
 
 class VistaWindowResources : public views::WindowResources {
  public:
   VistaWindowResources() {
     InitClass();
   }
   virtual ~VistaWindowResources() {}
 
-  virtual SkBitmap* GetPartBitmap(views::FramePartBitmap part_id) const {
-    return bitmaps_[part_id];
+  virtual gfx::ImageSkia* GetPartImage(views::FramePartImage part_id) const {
+    return images_[part_id];
   }
 
  private:
   static void InitClass() {
     static bool initialized = false;
     if (!initialized) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-      for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i) {
+      for (int i = 0; i < FRAME_PART_IMAGE_COUNT; ++i) {
         int id = kVistaFramePartIDs[i];
         if (id != 0)
-          bitmaps_[i] = rb.GetBitmapNamed(id);
+          images_[i] = rb.GetImageSkiaNamed(id);
       }
       initialized = true;
     }
   }
 
-  static SkBitmap* bitmaps_[FRAME_PART_BITMAP_COUNT];
+  static gfx::ImageSkia* images_[FRAME_PART_IMAGE_COUNT];
 
   DISALLOW_COPY_AND_ASSIGN(VistaWindowResources);
 };
 
-SkBitmap* XPWindowResources::bitmaps_[];
-SkBitmap* VistaWindowResources::bitmaps_[];
+gfx::ImageSkia* XPWindowResources::images_[];
+gfx::ImageSkia* VistaWindowResources::images_[];
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowFrameView
 
 class ConstrainedWindowFrameView : public views::NonClientFrameView,
                                    public views::ButtonListener {
  public:
   explicit ConstrainedWindowFrameView(ConstrainedWindowViews* container);
   virtual ~ConstrainedWindowFrameView();
 
@@ skipping 267 matching lines @@
   // eye) more like additional space than does the 3D edge above; hence the +1.
   int y = unavailable_px_at_top + (NonClientTopBorderHeight() -
       unavailable_px_at_top - size - TitlebarBottomThickness() + 1) / 2;
   return gfx::Rect(kFrameBorderThickness + kTitleLeftSpacing, y, size, size);
 }
 
 void ConstrainedWindowFrameView::PaintFrameBorder(gfx::Canvas* canvas) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   frame_background_->set_frame_color(ThemeService::GetDefaultColor(
       ThemeService::COLOR_FRAME));
-  SkBitmap* theme_frame = rb.GetBitmapNamed(IDR_THEME_FRAME);
-  frame_background_->set_theme_bitmap(theme_frame);
-  frame_background_->set_theme_overlay_bitmap(NULL);
+  gfx::ImageSkia* theme_frame = rb.GetImageSkiaNamed(IDR_THEME_FRAME);
+  frame_background_->set_theme_image(theme_frame);
+  frame_background_->set_theme_overlay_image(NULL);
   frame_background_->set_top_area_height(theme_frame->height());
 
   frame_background_->SetCornerImages(
-      resources_->GetPartBitmap(FRAME_TOP_LEFT_CORNER),
-      resources_->GetPartBitmap(FRAME_TOP_RIGHT_CORNER),
-      resources_->GetPartBitmap(FRAME_BOTTOM_LEFT_CORNER),
-      resources_->GetPartBitmap(FRAME_BOTTOM_RIGHT_CORNER));
+      resources_->GetPartImage(FRAME_TOP_LEFT_CORNER),
+      resources_->GetPartImage(FRAME_TOP_RIGHT_CORNER),
+      resources_->GetPartImage(FRAME_BOTTOM_LEFT_CORNER),
+      resources_->GetPartImage(FRAME_BOTTOM_RIGHT_CORNER));
   frame_background_->SetSideImages(
-      resources_->GetPartBitmap(FRAME_LEFT_EDGE),
-      resources_->GetPartBitmap(FRAME_TOP_EDGE),
-      resources_->GetPartBitmap(FRAME_RIGHT_EDGE),
-      resources_->GetPartBitmap(FRAME_BOTTOM_EDGE));
+      resources_->GetPartImage(FRAME_LEFT_EDGE),
+      resources_->GetPartImage(FRAME_TOP_EDGE),
+      resources_->GetPartImage(FRAME_RIGHT_EDGE),
+      resources_->GetPartImage(FRAME_BOTTOM_EDGE));
   frame_background_->PaintRestored(canvas, this);
 }
 
 void ConstrainedWindowFrameView::PaintTitleBar(gfx::Canvas* canvas) {
   canvas->DrawStringInt(
       container_->widget_delegate()->GetWindowTitle(),
       *title_font_, GetTitleColor(), GetMirroredXForRect(title_bounds_),
       title_bounds_.y(), title_bounds_.width(), title_bounds_.height());
 }
 
@@ skipping 182 matching lines @@
 }
 
 void ConstrainedWindowViews::OnNativeConstrainedWindowMouseActivate() {
   Activate();
 }
 
 views::internal::NativeWidgetDelegate*
     ConstrainedWindowViews::AsNativeWidgetDelegate() {
   return this;
 }