chrome/browser/bookmarks/bookmark_pasteboard_helper_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/bookmarks/bookmark_pasteboard_helper_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/bookmarks/bookmark_pasteboard_helper_mac.mm

diff --git a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm

index cf1d7b2e92b2bbbfe087a8a19f66a127c0a80e97..1cbf70192e9134bc016ded4c30481b8ae4e31837 100644

--- a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm

+++ b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm

@@ -353,7 +353,7 @@ NSImage* DragImageForBookmark(NSImage* favicon, const string16& title) {

// If no favicon, use a default.

if (!favicon) {

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

- favicon = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON);

+ favicon = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToNSImage();

}

// If no title, just use icon.

« no previous file with comments | « no previous file | chrome/browser/themes/theme_service_mac.mm » ('j') | no next file with comments »