Add theme support for the yellow star on the Mac....

chrome/browser/cocoa/toolbar_controller.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
+#import "chrome/browser/cocoa/gradient_button_cell.h"
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 
-// Names of images in the bundle for the star icon (normal and 'starred').
-static NSString* const kStarImageName = @"star_Template.pdf";
+// Name of image in the bundle for the yellow of the star icon.
 static NSString* const kStarredImageName = @"starred.pdf";
 
 @interface ToolbarController(Private)
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(std::wstring*)prefName;
 @end
 
 namespace ToolbarControllerInternal {
 
 // A C++ class registered for changes in preferences. Bridges the
@@ skipping 128 matching lines @@
   [homeButton_ setEnabled:commands->IsCommandEnabled(IDC_HOME) ? YES : NO];
   [starButton_ setEnabled:commands->IsCommandEnabled(IDC_STAR) ? YES : NO];
 }
 
 - (void)updateToolbarWithContents:(TabContents*)tab
                shouldRestoreState:(BOOL)shouldRestore {
   locationBarView_->Update(tab, shouldRestore ? true : false);
 }
 
 - (void)setStarredState:(BOOL)isStarred {
-  NSString* starImageName = kStarImageName;
-  BOOL isTemplate = YES;
-  if (isStarred) {
-    starImageName = kStarredImageName;
-    isTemplate = NO;
-  }
-  NSImage* starImage = nsimage_cache::ImageNamed(starImageName);
-  if (isTemplate)
-    [starImage setTemplate:YES];
-  [starButton_ setImage:starImage];
+  NSImage* starImage = nil;
+  if (isStarred)
+    starImage = nsimage_cache::ImageNamed(kStarredImageName);
+
+  [(GradientButtonCell*)[starButton_ cell] setUnderlayImage:starImage];
 }
 
 - (void)setIsLoading:(BOOL)isLoading {
   NSString* imageName = @"go_Template.pdf";
   NSInteger tag = IDC_GO;
   if (isLoading) {
     imageName = @"stop_Template.pdf";
     tag = IDC_STOP;
   }
   NSImage* stopStartImage = nsimage_cache::ImageNamed(imageName);
@@ skipping 133 matching lines @@
                    forView:pageButton_];
 }
 
 - (IBAction)showWrenchMenu:(id)sender {
   [NSMenu popUpContextMenu:wrenchMenu_
                  withEvent:[NSApp currentEvent]
                    forView:wrenchButton_];
 }
 
 @end