Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

chrome/browser/ui/views/hung_renderer_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/browser_dialogs.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include <windows.h>
 #endif
 
@@ skipping 282 matching lines @@
   views::View* kill_button_container_;
 
   // The model that provides the contents of the table that shows a list of
   // pages affected by the hang.
   scoped_ptr<HungPagesTableModel> hung_pages_table_model_;
 
   // Whether or not we've created controls for ourself.
   bool initialized_;
 
   // An amusing icon image.
-  static SkBitmap* frozen_icon_;
+  static gfx::ImageSkia* frozen_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(HungRendererDialogView);
 };
 
 // static
-SkBitmap* HungRendererDialogView::frozen_icon_ = NULL;
+gfx::ImageSkia* HungRendererDialogView::frozen_icon_ = NULL;
 
 // The distance in pixels from the top of the relevant contents to place the
 // warning window.
 static const int kOverlayContentsOffsetY = 50;
 
 // The dimensions of the hung pages list table view, in pixels.
 static const int kTableViewWidth = 300;
 static const int kTableViewHeight = 100;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 229 matching lines @@
   int window_y = contents_bounds.y() + kOverlayContentsOffsetY;
   return gfx::Rect(window_x, window_y, window_bounds.width(),
                    window_bounds.height());
 }
 
 // static
 void HungRendererDialogView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    frozen_icon_ = rb.GetBitmapNamed(IDR_FROZEN_TAB_ICON);
+    frozen_icon_ = rb.GetImageSkiaNamed(IDR_FROZEN_TAB_ICON);
     initialized = true;
   }
 }
 
 static HungRendererDialogView* CreateHungRendererDialogView() {
   HungRendererDialogView* cv = new HungRendererDialogView;
   views::Widget::CreateWindow(cv);
   return cv;
 }
 
 namespace browser {
 
 void ShowHungRendererDialog(WebContents* contents) {
   if (!logging::DialogsAreSuppressed()) {
     if (!g_instance)
       g_instance = CreateHungRendererDialogView();
     g_instance->ShowForWebContents(contents);
   }
 }
 
 void HideHungRendererDialog(WebContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->EndForWebContents(contents);
 }
 
 }  // namespace browser