chrome/browser/ui/cocoa/history_menu_bridge.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/history_menu_bridge.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/history_menu_bridge.mm

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

index 2aa9644da635989cda8da4eb1880adebda4413a0..0d26d0783f96bd52c3b0a9e83b1b49fc49d96666 100644

--- a/chrome/browser/ui/cocoa/history_menu_bridge.mm

+++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm

@@ -105,11 +105,12 @@ HistoryMenuBridge::HistoryMenuBridge(Profile* profile)

}

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

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

+ default_favicon_.reset(

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

// Set the static icons in the menu.

NSMenuItem* item = [HistoryMenu() itemWithTag:IDC_SHOW_HISTORY];

- [item setImage:rb.GetNativeImageNamed(IDR_HISTORY_FAVICON)];

+ [item setImage:rb.GetNativeImageNamed(IDR_HISTORY_FAVICON).ToNSImage()];

// The service is not ready for use yet, so become notified when it does.

if (!history_service_) {