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

chrome/browser/chromeos/login/simple_web_view_dialog.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/chromeos/login/simple_web_view_dialog.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 326 matching lines @@
       web_contents->GetController().ReloadIgnoringCache(true);
       break;
     default:
       NOTREACHED();
   }
 }
 
 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() {
   const content::NavigationController& navigation_controller =
       web_view_->web_contents()->GetController();
   back_->SetEnabled(navigation_controller.CanGoBack());
   forward_->SetEnabled(navigation_controller.CanGoForward());
 }
 
 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) {
   if (reload_) {
     reload_->ChangeMode(
         is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,
         force);
   }
 }
 
 }  // namespace chromeos