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

chrome/browser/ui/views/sad_tab_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/sad_tab_view.h"
 
 #include <string>
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 137 matching lines @@
   SetLayoutManager(layout);
 
   const int column_set_id = 0;
   views::ColumnSet* columns = layout->AddColumnSet(column_set_id);
   columns->AddPaddingColumn(1, kPadding);
   columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
                      0, views::GridLayout::USE_PREF, 0, 0);
   columns->AddPaddingColumn(1, kPadding);
 
   views::ImageView* image = new views::ImageView();
-  image->SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  image->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       (kind_ == CRASHED) ? IDR_SAD_TAB : IDR_KILLED_TAB));
   layout->StartRowWithPadding(0, column_set_id, 1, kPadding);
   layout->AddView(image);
 
   views::Label* title = CreateLabel(l10n_util::GetStringUTF16(
       (kind_ == CRASHED) ? IDS_SAD_TAB_TITLE : IDS_KILLED_TAB_TITLE));
   title->SetFont(base_font_.DeriveFont(kTitleFontSizeDelta, gfx::Font::BOLD));
   layout->StartRowWithPadding(0, column_set_id, 0, kPadding);
   layout->AddView(title);
 
@@ skipping 88 matching lines @@
 }
 
 views::Link* SadTabView::CreateLink(const string16& text) {
   views::Link* link = new views::Link(text);
   link->SetFont(base_font_.DeriveFont(kMessageFontSizeDelta));
   link->SetBackgroundColor(background()->get_color());
   link->SetEnabledColor(kTextColor);
   link->set_listener(this);
   return link;
 }