Add ability to theme our buttons....

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 220 matching lines @@
     bookmark_menu_ = new BookmarkMenuButton(browser_);
     AddChildView(bookmark_menu_);
   } else {
     bookmark_menu_ = NULL;
   }
 }
 
 void BrowserToolbarView::LoadLeftSideControlsImages() {
   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));
+      tp->GetBitmapNamed(IDR_BACK_P));
   back_->SetImage(views::CustomButton::BS_DISABLED,
-    tp->GetBitmapNamed(IDR_BACK_D));
+      tp->GetBitmapNamed(IDR_BACK_D));
+  back_->SetBackground(color, background, 
+      tp->GetBitmapNamed(IDR_BACK_MASK));
 
   forward_->SetImage(views::CustomButton::BS_NORMAL,
-    tp->GetBitmapNamed(IDR_FORWARD));
+      tp->GetBitmapNamed(IDR_FORWARD));
   forward_->SetImage(views::CustomButton::BS_HOT,
-    tp->GetBitmapNamed(IDR_FORWARD_H));
+      tp->GetBitmapNamed(IDR_FORWARD_H));
   forward_->SetImage(views::CustomButton::BS_PUSHED,
-    tp->GetBitmapNamed(IDR_FORWARD_P));
+      tp->GetBitmapNamed(IDR_FORWARD_P));
   forward_->SetImage(views::CustomButton::BS_DISABLED,
-    tp->GetBitmapNamed(IDR_FORWARD_D));
+      tp->GetBitmapNamed(IDR_FORWARD_D));
+  forward_->SetBackground(color, background, 
+      tp->GetBitmapNamed(IDR_FORWARD_MASK));
 
   reload_->SetImage(views::CustomButton::BS_NORMAL,
-    tp->GetBitmapNamed(IDR_RELOAD));
+      tp->GetBitmapNamed(IDR_RELOAD));
   reload_->SetImage(views::CustomButton::BS_HOT,
-    tp->GetBitmapNamed(IDR_RELOAD_H));
+      tp->GetBitmapNamed(IDR_RELOAD_H));
   reload_->SetImage(views::CustomButton::BS_PUSHED,
-    tp->GetBitmapNamed(IDR_RELOAD_P));
+      tp->GetBitmapNamed(IDR_RELOAD_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));
+      tp->GetBitmapNamed(IDR_HOME_P));
+  home_->SetBackground(color, background, 
+      tp->GetBitmapNamed(IDR_BUTTON_MASK));
 }
 
 void BrowserToolbarView::LoadCenterStackImages() {
   ThemeProvider* tp = GetThemeProvider();
 
+  SkColor color = tp->GetColor(BrowserThemeProvider::COLOR_BUTTON_BACKGROUND);
+  SkBitmap* background = tp->GetBitmapNamed(IDR_THEME_BUTTON_BACKGROUND);
+
   star_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_STAR));
   star_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_STAR_H));
   star_->SetImage(views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_STAR_P));
   star_->SetImage(views::CustomButton::BS_DISABLED,
       tp->GetBitmapNamed(IDR_STAR_D));
   star_->SetToggledImage(views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_STARRED));
   star_->SetToggledImage(views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_STARRED_H));
   star_->SetToggledImage(views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_STARRED_P));
+  star_->SetBackground(color, background, 
+      tp->GetBitmapNamed(IDR_STAR_MASK));
 
   go_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_GO));
   go_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_GO_H));
   go_->SetImage(views::CustomButton::BS_PUSHED, tp->GetBitmapNamed(IDR_GO_P));
   go_->SetToggledImage(views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_STOP));
   go_->SetToggledImage(views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_STOP_H));
   go_->SetToggledImage(views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_STOP_P));
+  go_->SetBackground(color, background, 
+      tp->GetBitmapNamed(IDR_GO_MASK));
 }
 
 void BrowserToolbarView::LoadRightSideControlsImages() {
   ThemeProvider* tp = GetThemeProvider();
 
   // We use different menu button images if the locale is right-to-left.
   if (UILayoutIsRightToLeft())
     page_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_PAGE_RTL));
   else
     page_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_PAGE));
@@ skipping 671 matching lines @@
     case IDC_COPY:
       *accel = views::Accelerator(L'C', false, true, false);
       return true;
     case IDC_PASTE:
       *accel = views::Accelerator(L'V', false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the frame.
   return GetWidget()->GetAccelerator(id, accel);
 }