Index: chrome/browser/views/toolbar_view.cc |
=================================================================== |
--- chrome/browser/views/toolbar_view.cc (revision 53847) |
+++ chrome/browser/views/toolbar_view.cc (working copy) |
@@ -534,17 +534,12 @@ |
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)); |
@@ -554,15 +549,11 @@ |
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)); |
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)); |
reload_->SetImage(views::CustomButton::BS_NORMAL, |
tp->GetBitmapNamed(IDR_RELOAD)); |
@@ -576,8 +567,6 @@ |
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)); |
app_menu_->SetIcon(GetAppMenuIcon()); |
} |