content/browser/web_contents/web_drag_source_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: content/browser/web_contents/web_drag_source_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: content/browser/web_contents/web_drag_source_mac.mm

diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm

index 1133b7480a7932ff517f80a6ea645d0bdef6dd2d..67010e3bc2abaacd9d3795669abc8afc45f09c80 100644

--- a/content/browser/web_contents/web_drag_source_mac.mm

+++ b/content/browser/web_contents/web_drag_source_mac.mm

@@ -457,7 +457,8 @@ void PromiseWriterHelper(const WebDropData& drop_data,

return dragImage_;

// Default to returning a generic image.

- return content::GetContentClient()->GetNativeImageNamed(IDR_DEFAULT_FAVICON);

+ return content::GetContentClient()->GetNativeImageNamed(

+ IDR_DEFAULT_FAVICON).ToNSImage();

}

@end // @implementation WebDragSource (Private)

« no previous file with comments | « chrome/browser/ui/tests/ui_gfx_image_unittest.mm ('k') | ui/gfx/image/image.h » ('j') | no next file with comments »