This CL removes ResourceBundle::GetBitmapNamed() and ThemeProvider::GetBitmapNamed()

BUG=153180
Test=Compiles

R=sail,erg
TBR=sky

Review URL: https://chromiumcodereview.appspot.com/11015007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160789 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc
index 8a98c04..2b41351 100644
--- a/chrome/browser/ui/gtk/custom_button.cc
+++ b/chrome/browser/ui/gtk/custom_button.cc
@@ -139,14 +139,15 @@ gboolean CustomDrawButtonBase::OnExpose(GtkWidget* widget,
 }
 
 void CustomDrawButtonBase::SetBackground(SkColor color,
-                                         SkBitmap* image, SkBitmap* mask) {
-  if (!image || !mask) {
+                                         const SkBitmap& image,
+                                         const SkBitmap& mask) {
+  if (image.isNull() || mask.isNull()) {
     if (background_image_->valid()) {
       background_image_->UsePixbuf(NULL);
     }
   } else {
     SkBitmap img =
-        SkBitmapOperations::CreateButtonBackground(color, *image, *mask);
+        SkBitmapOperations::CreateButtonBackground(color, image, mask);
 
     GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(img);
     background_image_->UsePixbuf(pixbuf);
@@ -336,7 +337,8 @@ void CustomDrawButton::UnsetPaintOverride() {
 }
 
 void CustomDrawButton::SetBackground(SkColor color,
-                                     SkBitmap* image, SkBitmap* mask) {
+                                     const SkBitmap& image,
+                                     const SkBitmap& mask) {
   button_base_.SetBackground(color, image, mask);
 }