Merge 53888 - Remove button masks for toolbar buttons, which will no longer b...

chrome/browser/views/toolbar_view.cc

 // 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.
 
 #include "chrome/browser/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
@@ skipping 535 matching lines @@
 // ToolbarView, private:
 
 int ToolbarView::PopupTopSpacing() const {
   return GetWindow()->GetNonClientView()->UseNativeFrame() ?
       0 : kPopupTopSpacingNonGlass;
 }
 
 void ToolbarView::LoadImages() {
   ThemeProvider* tp = GetThemeProvider();
 
-  SkColor color = tp->GetColor(BrowserThemeProvider::COLOR_BUTTON_BACKGROUND);
-  SkBitmap* background = tp->GetBitmapNamed(IDR_THEME_BUTTON_BACKGROUND);
-
   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_PUSHED,
       tp->GetBitmapNamed(IDR_BACK_P));
   back_->SetImage(views::CustomButton::BS_DISABLED,
       tp->GetBitmapNamed(IDR_BACK_D));
-  back_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_BACK_MASK));
 
   forward_->SetImage(views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_FORWARD));
   forward_->SetImage(views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_FORWARD_H));
   forward_->SetImage(views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_FORWARD_P));
   forward_->SetImage(views::CustomButton::BS_DISABLED,
       tp->GetBitmapNamed(IDR_FORWARD_D));
-  forward_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_FORWARD_MASK));
 
   reload_->SetImage(views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_RELOAD));
   reload_->SetImage(views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_RELOAD_H));
   reload_->SetImage(views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_RELOAD_P));
   reload_->SetToggledImage(views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_STOP));
   reload_->SetToggledImage(views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_STOP_H));
   reload_->SetToggledImage(views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_STOP_P));
-  reload_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_BUTTON_MASK));
 
   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_PUSHED,
       tp->GetBitmapNamed(IDR_HOME_P));
-  home_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_BUTTON_MASK));
 
   app_menu_->SetIcon(GetAppMenuIcon());
 }
 
 void ToolbarView::ShowUpgradeReminder() {
   update_reminder_animation_.reset(new SlideAnimation(this));
   update_reminder_animation_->SetSlideDuration(kPulseDuration);
 
   // Then start the recurring timer for pulsating it.
   upgrade_reminder_pulse_timer_.Start(
@@ skipping 44 matching lines @@
         *tp->GetBitmapNamed(IDR_UPGRADE_DOT_INACTIVE),
         *tp->GetBitmapNamed(IDR_UPGRADE_DOT_ACTIVE),
         value);
   }
 
   canvas->DrawBitmapInt(badge, kUpgradeDotOffset,
                         icon.height() - badge.height());
 
   return canvas->ExtractBitmap();
 }