summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/toolbar_controller.mm
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 19:15:04 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 19:15:04 +0000
commit355284254f9997a21409da26b58f25f34bfd5d64 (patch)
tree3766ef18ae0b112a5c8953b9e624595e4f5e06b7 /chrome/browser/cocoa/toolbar_controller.mm
parentcf3ac1f27fcd2986b62262f4f458dc9c2a519732 (diff)
downloadchromium_src-355284254f9997a21409da26b58f25f34bfd5d64.zip
chromium_src-355284254f9997a21409da26b58f25f34bfd5d64.tar.gz
chromium_src-355284254f9997a21409da26b58f25f34bfd5d64.tar.bz2
Add theme support for the yellow star on the Mac.
BUG=none TEST=go to a bookmarked page; the outline of the yellow star should be themed Review URL: http://codereview.chromium.org/155851 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/toolbar_controller.mm')
-rw-r--r--chrome/browser/cocoa/toolbar_controller.mm19
1 files changed, 7 insertions, 12 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index 681795b..de9b9a0 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -9,6 +9,7 @@
#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"
@@ -19,8 +20,7 @@
#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)
@@ -169,16 +169,11 @@ class PrefObserverBridge : public NotificationObserver {
}
- (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 {