chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_controller.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

index 07b160a882880d95bbbac68bf69117e5c1d90293..c1503b44c0c7d780cb61d26c3901a0dadb6c8560 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

@@ -251,8 +251,9 @@ void RecordAppLaunch(Profile* profile, GURL url) {

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

folderImage_.reset(

- [rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER) retain]);

- defaultImage_.reset([rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);

+ rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER).CopyNSImage());

+ defaultImage_.reset(

+ rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).CopyNSImage());

// Register for theme changes, bookmark button pulsing, ...

NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];