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

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

index 5d70e2e940df829159e5f6176a31696d50ca0fe3..9aa55db6fb1834332daea01b42e0a4316e345fb8 100644

--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

@@ -188,7 +188,8 @@ bool ContentSettingDecoration::UpdateFromWebContents(

// TODO(thakis): We should use pdfs for these icons on OSX.

// http://crbug.com/35847

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

- SetImage(rb.GetNativeImageNamed(content_setting_image_model_->get_icon()));

+ SetImage(rb.GetNativeImageNamed(

+ content_setting_image_model_->get_icon()).ToNSImage());

SetToolTip(base::SysUTF8ToNSString(

content_setting_image_model_->get_tooltip()));