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

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

index e0bc05fcd58fa2456510b2dbc0182989ad85dcb7..760d6018c684dd793280a882dab97fa54a1c3276 100644

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

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

@@ -181,9 +181,9 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {

confirmButtonTitle =

base::SysUTF16ToNSString(downloadModel->GetWarningConfirmButtonText());

if (downloadModel->IsMalicious())

- alertIcon = rb.GetNativeImageNamed(IDR_SAFEBROWSING_WARNING);

+ alertIcon = rb.GetNativeImageNamed(IDR_SAFEBROWSING_WARNING).ToNSImage();

else

- alertIcon = rb.GetNativeImageNamed(IDR_WARNING);

+ alertIcon = rb.GetNativeImageNamed(IDR_WARNING).ToNSImage();

DCHECK(alertIcon);

[image_ setImage:alertIcon];

DCHECK(dangerousWarning);