chrome/browser/ui/cocoa/download/download_show_all_button.mm - Issue 10933083: Remove deprecated gfx::Image::operator NSImage*().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/download/download_show_all_button.mm

Issue 10933083: Remove deprecated gfx::Image::operator NSImage*(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Comments and merge Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/cocoa/download/download_show_all_button.mm

diff --git a/chrome/browser/ui/cocoa/download/download_show_all_button.mm b/chrome/browser/ui/cocoa/download/download_show_all_button.mm

index f5aea923df4e0608b1e0393b0acfcbc2baaff48a..81b635405d5a9e0b48a198cc29f67b7b373a679a 100644

--- a/chrome/browser/ui/cocoa/download/download_show_all_button.mm

+++ b/chrome/browser/ui/cocoa/download/download_show_all_button.mm

@@ -16,8 +16,7 @@

- (void)awakeFromNib {

DCHECK([[self cell] isKindOfClass:[DownloadShowAllCell class]]);

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

- NSImage* favicon = rb.GetNativeImageNamed(IDR_DOWNLOADS_FAVICON);

- DCHECK(favicon);

+ NSImage* favicon = rb.GetNativeImageNamed(IDR_DOWNLOADS_FAVICON).ToNSImage();

[self setImage:favicon];

}