chrome/browser/ui/cocoa/download/download_item_mac.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_item_mac.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_item_mac.mm

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

index 741575be43bcb98619d3c670289e57ccdd8e454c..331137867490c406ce602c271f03d1d7f84d4f31 100644

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

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

@@ -84,7 +84,7 @@ void DownloadItemMac::LoadIcon() {

FilePath file = download_model_->download()->GetUserVerifiedFilePath();

gfx::Image* icon = icon_manager->LookupIcon(file, IconLoader::ALL);

if (icon) {

- [item_controller_ setIcon:*icon];

+ [item_controller_ setIcon:icon->ToNSImage()];

return;

}

@@ -98,5 +98,5 @@ void DownloadItemMac::OnExtractIconComplete(IconManager::Handle handle,

gfx::Image* icon) {

if (!icon)

return;

- [item_controller_ setIcon:*icon];

+ [item_controller_ setIcon:icon->ToNSImage()];

}