diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 00:46:49 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 00:46:49 +0000 |
| commit | 110a4e7b14519e6b3771dd9c0501618ed45fc837 (patch) | |
| tree | 75eeaa9ef1c7569a7aed2282895155f7234b2d15 /chrome/browser/cocoa/tab_cell.mm | |
| parent | df5a4ffbb5531ca94bcf9b6a9825a99a3413c47b (diff) | |
| download | chromium_src-110a4e7b14519e6b3771dd9c0501618ed45fc837.zip chromium_src-110a4e7b14519e6b3771dd9c0501618ed45fc837.tar.gz chromium_src-110a4e7b14519e6b3771dd9c0501618ed45fc837.tar.bz2 | |
Reverting 24700.
Review URL: http://codereview.chromium.org/181002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_cell.mm')
| -rw-r--r-- | chrome/browser/cocoa/tab_cell.mm | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/chrome/browser/cocoa/tab_cell.mm b/chrome/browser/cocoa/tab_cell.mm index 6823e3b..326f1f7 100644 --- a/chrome/browser/cocoa/tab_cell.mm +++ b/chrome/browser/cocoa/tab_cell.mm @@ -2,12 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "base/scoped_nsobject.h" #import "chrome/browser/cocoa/tab_cell.h" #import "third_party/GTM/AppKit/GTMTheme.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" - @implementation TabCell - (id)initTextCell:(NSString *)aString { @@ -20,7 +18,7 @@ - (NSBackgroundStyle)interiorBackgroundStyle { return [[[self controlView] gtm_theme] - interiorBackgroundStyleForStyle:GTMThemeStyleToolBar + interiorBackgroundStyleForStyle:GTMThemeStyleTabBarSelected state:GTMThemeStateActiveWindow]; } @@ -39,34 +37,6 @@ inView:controlView]; } -- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView { - GTMTheme* theme = [[self controlView] gtm_theme]; - NSColor* textColor = [theme textColorForStyle:GTMThemeStyleToolBar - state:[self isHighlighted]]; - - scoped_nsobject<NSShadow> textShadow([[NSShadow alloc] init]); - [textShadow setShadowBlurRadius:0.0f]; - [textShadow setShadowColor:[textColor gtm_legibleTextColor]]; - [textShadow setShadowOffset:NSMakeSize(0.0f, -1.0f)]; - - NSDictionary* attributes = - [NSDictionary dictionaryWithObjectsAndKeys: - [self font], NSFontAttributeName, - textColor, NSForegroundColorAttributeName, - textShadow.get(), NSShadowAttributeName, - nil]; - - [[self title] drawInRect:[self titleRectForBounds:cellFrame] - withAttributes:attributes]; - - NSRect imageBounds = NSZeroRect; - imageBounds.size = [[self image] size]; - [[self image] drawInRect:[self imageRectForBounds:cellFrame] - fromRect:imageBounds - operation:NSCompositeSourceOver - fraction:1.0]; -} - - (void)highlight:(BOOL)flag withFrame:(NSRect)cellFrame inView:(NSView *)controlView { |