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

chrome/browser/chromeos/login/simple_web_view_dialog.cc

Index: chrome/browser/chromeos/login/simple_web_view_dialog.cc
diff --git a/chrome/browser/chromeos/login/simple_web_view_dialog.cc b/chrome/browser/chromeos/login/simple_web_view_dialog.cc
index 8b37a5bff18607fa2a3533fd82f4a2fc321c763f..7058f5922cc16f7cdea22abdd99a4bec2c62b86e 100644
--- a/chrome/browser/chromeos/login/simple_web_view_dialog.cc
+++ b/chrome/browser/chromeos/login/simple_web_view_dialog.cc
@@ -344,36 +344,38 @@ void SimpleWebViewDialog::ExecuteCommandWithDisposition(
 void SimpleWebViewDialog::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));
 }
 
 void SimpleWebViewDialog::UpdateButtons() {