Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/about_chrome_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 "chrome/browser/ui/views/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 130 matching lines @@
 void AboutChromeView::Init() {
   text_direction_is_rtl_ = base::i18n::IsRTL();
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   // Views we will add to the *parent* of this dialog, since it will display
   // next to the buttons which we don't draw ourselves.
   throbber_.reset(new views::Throbber(50, true));
   throbber_->set_owned_by_client();
   throbber_->SetVisible(false);
 
-  SkBitmap* success_image = rb.GetBitmapNamed(IDR_UPDATE_UPTODATE);
+  gfx::ImageSkia* success_image = rb.GetImageSkiaNamed(IDR_UPDATE_UPTODATE);
   success_indicator_.SetImage(*success_image);
   success_indicator_.set_owned_by_client();
 
-  SkBitmap* update_available_image = rb.GetBitmapNamed(IDR_UPDATE_AVAILABLE);
+  gfx::ImageSkia* update_available_image = rb.GetImageSkiaNamed(
+      IDR_UPDATE_AVAILABLE);
   update_available_indicator_.SetImage(*update_available_image);
   update_available_indicator_.set_owned_by_client();
 
-  SkBitmap* timeout_image = rb.GetBitmapNamed(IDR_UPDATE_FAIL);
+  gfx::ImageSkia* timeout_image = rb.GetImageSkiaNamed(IDR_UPDATE_FAIL);
   timeout_indicator_.SetImage(*timeout_image);
   timeout_indicator_.set_owned_by_client();
 
   update_label_.SetVisible(false);
   update_label_.set_owned_by_client();
 
   // Regular view controls we draw by ourself. First, we add the background
-  // image for the dialog. We have two different background bitmaps, one for
-  // LTR UIs and one for RTL UIs. We load the correct bitmap based on the UI
+  // image for the dialog. We have two different background images, one for
+  // LTR UIs and one for RTL UIs. We load the correct image based on the UI
   // layout of the view.
   about_dlg_background_logo_ = new views::ImageView();
-  SkBitmap* about_background_logo = rb.GetBitmapNamed(base::i18n::IsRTL() ?
-      IDR_ABOUT_BACKGROUND_RTL : IDR_ABOUT_BACKGROUND);
+  gfx::ImageSkia* about_background_logo = rb.GetImageSkiaNamed(
+      base::i18n::IsRTL() ? IDR_ABOUT_BACKGROUND_RTL : IDR_ABOUT_BACKGROUND);
 
   about_dlg_background_logo_->SetImage(*about_background_logo);
   AddChildView(about_dlg_background_logo_);
 
   // Add the dialog labels.
   about_title_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   about_title_label_->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
       ui::ResourceBundle::BaseFont).DeriveFont(18));
   about_title_label_->SetBackgroundColor(SK_ColorWHITE);
@@ skipping 235 matching lines @@
                           std::min(max_x - update_label_x, sz.width()),
                           sz.height());
 }
 
 void AboutChromeView::OnPaint(gfx::Canvas* canvas) {
   views::View::OnPaint(canvas);
 
   // Draw the background image color (and the separator) across the dialog.
   // This will become the background for the logo image at the top of the
   // dialog.
-  SkBitmap* background = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
-      IDR_ABOUT_BACKGROUND_COLOR);
+  gfx::ImageSkia* background = ui::ResourceBundle::GetSharedInstance().
+      GetImageSkiaNamed(IDR_ABOUT_BACKGROUND_COLOR);
   canvas->TileImageInt(*background, 0, 0, dialog_dimensions_.width(),
                        background->height());
 
   gfx::Font font = ui::ResourceBundle::GetSharedInstance().GetFont(
       ui::ResourceBundle::BaseFont);
 
   const gfx::Rect label_bounds = main_text_label_->bounds();
 
   views::Link* link1 =
       chromium_url_appears_first_ ? chromium_url_ : open_source_url_;
@@ skipping 351 matching lines @@
   int height = error_label_->GetHeightForWidth(
       dialog_dimensions_.width() - (2 * views::kPanelHorizMargin)) +
           views::kRelatedControlVerticalSpacing;
   window_rect.set_height(window_rect.height() + height);
   GetWidget()->SetBounds(window_rect);
 
   return height;
 }
 
 #endif