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

chrome/browser/ui/views/toolbar_view.cc

Index: chrome/browser/ui/views/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index bdc2fe07ff84f16b2a6acbc493934cc52dae5011..464db9f34197e93257c208c755b03abafab8d4a0 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -748,41 +748,45 @@ int ToolbarView::PopupTopSpacing() const {
 void ToolbarView::LoadImages() {
   ui::ThemeProvider* tp = GetThemeProvider();
 
-  back_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_BACK));
-  back_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_BACK_H));
+  back_->SetImage(views::CustomButton::BS_NORMAL,
+      tp->GetImageSkiaNamed(IDR_BACK));
+  back_->SetImage(views::CustomButton::BS_HOT,
+      tp->GetImageSkiaNamed(IDR_BACK_H));
   back_->SetImage(views::CustomButton::BS_PUSHED,
-      tp->GetBitmapNamed(IDR_BACK_P));
+      tp->GetImageSkiaNamed(IDR_BACK_P));
   back_->SetImage(views::CustomButton::BS_DISABLED,
-      tp->GetBitmapNamed(IDR_BACK_D));
+      tp->GetImageSkiaNamed(IDR_BACK_D));
 
   forward_->SetImage(views::CustomButton::BS_NORMAL,
-      tp->GetBitmapNamed(IDR_FORWARD));
+      tp->GetImageSkiaNamed(IDR_FORWARD));
   forward_->SetImage(views::CustomButton::BS_HOT,
-      tp->GetBitmapNamed(IDR_FORWARD_H));
+      tp->GetImageSkiaNamed(IDR_FORWARD_H));
   forward_->SetImage(views::CustomButton::BS_PUSHED,
-      tp->GetBitmapNamed(IDR_FORWARD_P));
+      tp->GetImageSkiaNamed(IDR_FORWARD_P));
   forward_->SetImage(views::CustomButton::BS_DISABLED,
-      tp->GetBitmapNamed(IDR_FORWARD_D));
+      tp->GetImageSkiaNamed(IDR_FORWARD_D));
 
   reload_->SetImage(views::CustomButton::BS_NORMAL,
-      tp->GetBitmapNamed(IDR_RELOAD));
+      tp->GetImageSkiaNamed(IDR_RELOAD));
   reload_->SetImage(views::CustomButton::BS_HOT,
-      tp->GetBitmapNamed(IDR_RELOAD_H));
+      tp->GetImageSkiaNamed(IDR_RELOAD_H));
   reload_->SetImage(views::CustomButton::BS_PUSHED,
-      tp->GetBitmapNamed(IDR_RELOAD_P));
+      tp->GetImageSkiaNamed(IDR_RELOAD_P));
   reload_->SetToggledImage(views::CustomButton::BS_NORMAL,
-      tp->GetBitmapNamed(IDR_STOP));
+      tp->GetImageSkiaNamed(IDR_STOP));
   reload_->SetToggledImage(views::CustomButton::BS_HOT,
-      tp->GetBitmapNamed(IDR_STOP_H));
+      tp->GetImageSkiaNamed(IDR_STOP_H));
   reload_->SetToggledImage(views::CustomButton::BS_PUSHED,
-      tp->GetBitmapNamed(IDR_STOP_P));
+      tp->GetImageSkiaNamed(IDR_STOP_P));
   reload_->SetToggledImage(views::CustomButton::BS_DISABLED,
-      tp->GetBitmapNamed(IDR_STOP_D));
+      tp->GetImageSkiaNamed(IDR_STOP_D));
 
-  home_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_HOME));
-  home_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_HOME_H));
+  home_->SetImage(views::CustomButton::BS_NORMAL,
+      tp->GetImageSkiaNamed(IDR_HOME));
+  home_->SetImage(views::CustomButton::BS_HOT,
+      tp->GetImageSkiaNamed(IDR_HOME_H));
   home_->SetImage(views::CustomButton::BS_PUSHED,
-      tp->GetBitmapNamed(IDR_HOME_P));
+      tp->GetImageSkiaNamed(IDR_HOME_P));
 
   app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
   app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));