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

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

index 3eab997786b5ff566f352304472cb8c0e7fcaaf3..8a75dad14a220ba715e44af4b55a1a8f81cfc4f1 100644

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

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

@@ -88,7 +88,7 @@ const int kInstructionLabelMaxWidth = 150;

if (isWarmUp) {

NSImage* volumeIcon =

ResourceBundle::GetSharedInstance().GetNativeImageNamed(

- IDR_SPEECH_INPUT_MIC_EMPTY);

+ IDR_SPEECH_INPUT_MIC_EMPTY).ToNSImage();

size = [volumeIcon size];

}

newHeight += size.height;