diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 21:11:35 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 21:11:35 +0000 |
| commit | 7c7c990500cb9bc2b67dcf949e42e1c749a12deb (patch) | |
| tree | 1650ee6a30c6dce5f2dc9614ad2b917bd1d9c956 /chrome | |
| parent | f4da95ff623ea7b7b4bd2c6fe2402437a712b9df (diff) | |
| download | chromium_src-7c7c990500cb9bc2b67dcf949e42e1c749a12deb.zip chromium_src-7c7c990500cb9bc2b67dcf949e42e1c749a12deb.tar.gz chromium_src-7c7c990500cb9bc2b67dcf949e42e1c749a12deb.tar.bz2 | |
Fix dock icon to properly pick up pasted-on app icons.
BUG=http://crbug.com/35791
TEST=paste on a new app icon, download something, make sure icon stays in the dock as is
Review URL: http://codereview.chromium.org/628001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/dock_icon.mm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/dock_icon.mm b/chrome/browser/cocoa/dock_icon.mm index 498655a..56e432e 100644 --- a/chrome/browser/cocoa/dock_icon.mm +++ b/chrome/browser/cocoa/dock_icon.mm @@ -39,7 +39,12 @@ static const float kBadgeIndent = 5.0f; @synthesize progress = progress_; - (void)drawRect:(NSRect)dirtyRect { - NSImage* appIcon = [[NSApplication sharedApplication] applicationIconImage]; + // Not -[NSApplication applicationIconImage]; that fails to return a pasted + // custom icon. + NSWorkspace* workspace = [NSWorkspace sharedWorkspace]; + NSString* appPath = + [[workspace activeApplication] valueForKey:@"NSApplicationPath"]; + NSImage* appIcon = [workspace iconForFile:appPath]; [appIcon drawInRect:[self bounds] fromRect:NSZeroRect operation:NSCompositeSourceOver |