summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 20:58:02 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 20:58:02 +0000
commita196ea18299fa71547e380c1fa8f306f898bb4ac (patch)
tree43cb1aa684180736b44b2da9525de13672bbdbc7 /chrome/browser
parent3d4a691b9495479f49eaac0b2ff9411e34208b3a (diff)
downloadchromium_src-a196ea18299fa71547e380c1fa8f306f898bb4ac.zip
chromium_src-a196ea18299fa71547e380c1fa8f306f898bb4ac.tar.gz
chromium_src-a196ea18299fa71547e380c1fa8f306f898bb4ac.tar.bz2
[Mac] Remove dropshadows from browser actions.
BUG=73309 TEST=visual Review URL: http://codereview.chromium.org/6673052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/ui/cocoa/extensions/browser_action_button.mm21
1 files changed, 3 insertions, 18 deletions
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
index c1fceba..aaaefb9 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
@@ -37,7 +37,6 @@ static const CGFloat kBrowserActionBadgeOriginYOffset = 5;
namespace {
const CGFloat kAnimationDuration = 0.2;
-const CGFloat kShadowOffset = 2.0;
} // anonymous namespace
// A helper class to bridge the asynchronous Skia bitmap loading mechanism to
@@ -95,12 +94,11 @@ class ExtensionImageTrackerBridge : public NotificationObserver,
DISALLOW_COPY_AND_ASSIGN(ExtensionImageTrackerBridge);
};
-@interface BrowserActionCell(Internals)
-- (void)setIconShadow;
+@interface BrowserActionCell (Internals)
- (void)drawBadgeWithinFrame:(NSRect)frame;
@end
-@interface BrowserActionButton(Private)
+@interface BrowserActionButton (Private)
- (void)endDrag;
@end
@@ -276,7 +274,6 @@ class ExtensionImageTrackerBridge : public NotificationObserver,
[[NSColor clearColor] set];
NSRectFill(bounds);
- [[self cell] setIconShadow];
NSImage* actionImage = [self image];
const NSSize imageSize = [actionImage size];
@@ -290,8 +287,7 @@ class ExtensionImageTrackerBridge : public NotificationObserver,
fraction:1.0
neverFlipped:YES];
- bounds.origin.y += kShadowOffset - kBrowserActionBadgeOriginYOffset;
- bounds.origin.x -= kShadowOffset;
+ bounds.origin.y += kBrowserActionBadgeOriginYOffset;
[[self cell] drawBadgeWithinFrame:bounds];
[image unlockFocus];
@@ -305,16 +301,6 @@ class ExtensionImageTrackerBridge : public NotificationObserver,
@synthesize tabId = tabId_;
@synthesize extensionAction = extensionAction_;
-- (void)setIconShadow {
- // Create the shadow below and to the right of the drawn image.
- scoped_nsobject<NSShadow> imgShadow([[NSShadow alloc] init]);
- [imgShadow.get() setShadowOffset:NSMakeSize(kShadowOffset, -kShadowOffset)];
- [imgShadow setShadowBlurRadius:2.0];
- [imgShadow.get() setShadowColor:[[NSColor blackColor]
- colorWithAlphaComponent:0.3]];
- [imgShadow set];
-}
-
- (void)drawBadgeWithinFrame:(NSRect)frame {
gfx::CanvasSkiaPaint canvas(frame, false);
canvas.set_composite_alpha(true);
@@ -324,7 +310,6 @@ class ExtensionImageTrackerBridge : public NotificationObserver,
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
[NSGraphicsContext saveGraphicsState];
- [self setIconShadow];
[super drawInteriorWithFrame:cellFrame inView:controlView];
cellFrame.origin.y += kBrowserActionBadgeOriginYOffset;
[self drawBadgeWithinFrame:cellFrame];