Remove support for background masks. These are no longer necessary in the new theme.

BUG=50107
TEST=none
Review URL: http://codereview.chromium.org/2847079

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

6 files changed, 15 insertions, 39 deletions

diff --git a/chrome/browser/gtk/back_forward_button_gtk.cc b/chrome/browser/gtk/back_forward_button_gtk.cc
index 72559cc..6b0b213 100644
--- a/chrome/browser/gtk/back_forward_button_gtk.cc
+++ b/chrome/browser/gtk/back_forward_button_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -26,14 +26,13 @@ BackForwardButtonGtk::BackForwardButtonGtk(Browser* browser, bool is_forward)
     : browser_(browser),
       is_forward_(is_forward),
       show_menu_factory_(this) {
-  int normal, pushed, hover, disabled, background, tooltip;
+  int normal, pushed, hover, disabled, tooltip;
   const char* stock;
   if (is_forward) {
     normal = IDR_FORWARD;
     pushed = IDR_FORWARD_P;
     hover = IDR_FORWARD_H;
     disabled = IDR_FORWARD_D;
-    background = IDR_FORWARD_MASK;
     tooltip = IDS_TOOLTIP_FORWARD;
     stock = GTK_STOCK_GO_FORWARD;
   } else {
@@ -41,14 +40,12 @@ BackForwardButtonGtk::BackForwardButtonGtk(Browser* browser, bool is_forward)
     pushed = IDR_BACK_P;
     hover = IDR_BACK_H;
     disabled = IDR_BACK_D;
-    background = IDR_BACK_MASK;
     tooltip = IDS_TOOLTIP_BACK;
     stock = GTK_STOCK_GO_BACK;
   }
   button_.reset(new CustomDrawButton(
       GtkThemeProvider::GetFrom(browser_->profile()),
-      normal, pushed, hover, disabled, background, stock,
-      GTK_ICON_SIZE_SMALL_TOOLBAR));
+      normal, pushed, hover, disabled, stock, GTK_ICON_SIZE_SMALL_TOOLBAR));
   gtk_widget_set_tooltip_text(widget(),
                               l10n_util::GetStringUTF8(tooltip).c_str());
   menu_model_.reset(new BackForwardMenuModel(browser, is_forward ?
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index 442eedb..921048c 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -176,9 +176,8 @@ void BrowserToolbarGtk::Init(Profile* profile,
                      0);
 
   home_.reset(new CustomDrawButton(GtkThemeProvider::GetFrom(profile_),
-                                   IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
-                                   IDR_BUTTON_MASK, GTK_STOCK_HOME,
-                                   GTK_ICON_SIZE_SMALL_TOOLBAR));
+      IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0, GTK_STOCK_HOME,
+      GTK_ICON_SIZE_SMALL_TOOLBAR));
   gtk_widget_set_tooltip_text(home_->widget(),
       l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME).c_str());
   g_signal_connect(home_->widget(), "clicked",
diff --git a/chrome/browser/gtk/custom_button.cc b/chrome/browser/gtk/custom_button.cc
index a31ba9a..b891fa1 100644
--- a/chrome/browser/gtk/custom_button.cc
+++ b/chrome/browser/gtk/custom_button.cc
@@ -22,15 +22,13 @@ CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeProvider* theme_provider,
                                            int normal_id,
                                            int pressed_id,
                                            int hover_id,
-                                           int disabled_id,
-                                           int background_id)
+                                           int disabled_id)
     : background_image_(NULL),
       paint_override_(-1),
       normal_id_(normal_id),
       pressed_id_(pressed_id),
       hover_id_(hover_id),
       disabled_id_(disabled_id),
-      button_background_id_(background_id),
       theme_provider_(theme_provider),
       flipped_(false) {
   for (int i = 0; i < (GTK_STATE_INSENSITIVE + 1); ++i)
@@ -154,17 +152,6 @@ void CustomDrawButtonBase::Observe(NotificationType type,
   surfaces_[GTK_STATE_SELECTED]->UsePixbuf(NULL);
   surfaces_[GTK_STATE_INSENSITIVE]->UsePixbuf(disabled_id_ ?
       theme_provider_->GetRTLEnabledPixbufNamed(disabled_id_) : NULL);
-
-  // Use the tinted background in some themes.
-  if (button_background_id_) {
-    SkColor color = theme_provider_->GetColor(
-        BrowserThemeProvider::COLOR_BUTTON_BACKGROUND);
-    SkBitmap* background = theme_provider_->GetBitmapNamed(
-        IDR_THEME_BUTTON_BACKGROUND);
-    SkBitmap* mask = theme_provider_->GetBitmapNamed(button_background_id_);
-
-    SetBackground(color, background, mask);
-  }
 }
 
 CairoCachedSurface* CustomDrawButtonBase::PixbufForState(int state) {
@@ -235,7 +222,7 @@ CustomDrawButton::CustomDrawButton(int normal_id,
                                    int pressed_id,
                                    int hover_id,
                                    int disabled_id)
-    : button_base_(NULL, normal_id, pressed_id, hover_id, disabled_id, 0),
+    : button_base_(NULL, normal_id, pressed_id, hover_id, disabled_id),
       theme_provider_(NULL),
       gtk_stock_name_(NULL),
       icon_size_(GTK_ICON_SIZE_INVALID) {
@@ -250,11 +237,10 @@ CustomDrawButton::CustomDrawButton(GtkThemeProvider* theme_provider,
                                    int pressed_id,
                                    int hover_id,
                                    int disabled_id,
-                                   int background_id,
                                    const char* stock_id,
                                    GtkIconSize stock_size)
     : button_base_(theme_provider, normal_id, pressed_id, hover_id,
-                   disabled_id, background_id),
+                   disabled_id),
       theme_provider_(theme_provider),
       gtk_stock_name_(stock_id),
       icon_size_(stock_size) {
@@ -317,9 +303,8 @@ gboolean CustomDrawButton::OnCustomExpose(GtkWidget* widget,
 // static
 CustomDrawButton* CustomDrawButton::CloseButton(
     GtkThemeProvider* theme_provider) {
-  CustomDrawButton* button = new CustomDrawButton(
-      theme_provider, IDR_CLOSE_BAR, IDR_CLOSE_BAR_P,
-      IDR_CLOSE_BAR_H, 0, 0, GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+  CustomDrawButton* button = new CustomDrawButton(theme_provider, IDR_CLOSE_BAR,
+      IDR_CLOSE_BAR_P, IDR_CLOSE_BAR_H, 0, GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
   return button;
 }
 
diff --git a/chrome/browser/gtk/custom_button.h b/chrome/browser/gtk/custom_button.h
index 094e543..0142e18 100644
--- a/chrome/browser/gtk/custom_button.h
+++ b/chrome/browser/gtk/custom_button.h
@@ -36,8 +36,7 @@ class CustomDrawButtonBase : public NotificationObserver {
                        int normal_id,
                        int pressed_id,
                        int hover_id,
-                       int disabled_id,
-                       int background_id);
+                       int disabled_id);
 
   ~CustomDrawButtonBase();
 
@@ -82,7 +81,6 @@ class CustomDrawButtonBase : public NotificationObserver {
   int pressed_id_;
   int hover_id_;
   int disabled_id_;
-  int button_background_id_;
   GtkThemeProvider* theme_provider_;
 
   // Whether the button is flipped horizontally. Not used for RTL (we get
@@ -143,7 +141,6 @@ class CustomDrawButton : public NotificationObserver {
                    int pressed_id,
                    int hover_id,
                    int disabled_id,
-                   int background_id,
                    const char* stock_id,
                    GtkIconSize stock_size);
 
diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc
index 2b43c83..18a41258 100644
--- a/chrome/browser/gtk/find_bar_gtk.cc
+++ b/chrome/browser/gtk/find_bar_gtk.cc
@@ -240,7 +240,7 @@ void FindBarGtk::InitWidgets() {
 
   find_next_button_.reset(new CustomDrawButton(theme_provider_,
       IDR_FINDINPAGE_NEXT, IDR_FINDINPAGE_NEXT_H, IDR_FINDINPAGE_NEXT_H,
-      IDR_FINDINPAGE_NEXT_P, 0, GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU));
+      IDR_FINDINPAGE_NEXT_P, GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU));
   g_signal_connect(find_next_button_->widget(), "clicked",
                    G_CALLBACK(OnClicked), this);
   gtk_widget_set_tooltip_text(find_next_button_->widget(),
@@ -250,7 +250,7 @@ void FindBarGtk::InitWidgets() {
 
   find_previous_button_.reset(new CustomDrawButton(theme_provider_,
       IDR_FINDINPAGE_PREV, IDR_FINDINPAGE_PREV_H, IDR_FINDINPAGE_PREV_H,
-      IDR_FINDINPAGE_PREV_P, 0, GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU));
+      IDR_FINDINPAGE_PREV_P, GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU));
   g_signal_connect(find_previous_button_->widget(), "clicked",
                    G_CALLBACK(OnClicked), this);
   gtk_widget_set_tooltip_text(find_previous_button_->widget(),
diff --git a/chrome/browser/gtk/reload_button_gtk.cc b/chrome/browser/gtk/reload_button_gtk.cc
index 8e3cb8f..ca60962 100644
--- a/chrome/browser/gtk/reload_button_gtk.cc
+++ b/chrome/browser/gtk/reload_button_gtk.cc
@@ -31,10 +31,8 @@ ReloadButtonGtk::ReloadButtonGtk(LocationBarViewGtk* location_bar,
       visible_mode_(MODE_RELOAD),
       theme_provider_(browser ?
                       GtkThemeProvider::GetFrom(browser->profile()) : NULL),
-      reload_(theme_provider_, IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0,
-              IDR_BUTTON_MASK),
-      stop_(theme_provider_, IDR_STOP, IDR_STOP_P, IDR_STOP_H, 0,
-            IDR_BUTTON_MASK),
+      reload_(theme_provider_, IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0),
+      stop_(theme_provider_, IDR_STOP, IDR_STOP_P, IDR_STOP_H, 0),
       widget_(gtk_chrome_button_new()) {
   gtk_widget_set_size_request(widget_.get(), reload_.Width(), reload_.Height());