chrome/browser/ui/cocoa/infobars/infobar_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/infobars/infobar_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/infobars/infobar_controller.mm

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

index 555064ed2a9852b7d657d9ed711ff0b7fbed4221..57185db3e1b4ea7c2a0aab438169e0c8bbdf5edd 100644

--- a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm

+++ b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm

@@ -78,7 +78,7 @@ const float kAnimateCloseDuration = 0.12;

forButtonState:image_button_cell::kDisabledState];

if (delegate_->GetIcon()) {

- [image_ setImage:*(delegate_->GetIcon())];

+ [image_ setImage:delegate_->GetIcon()->ToNSImage()];

} else {

// No icon, remove it from the view and grow the textfield to include the

// space.