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

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

index 7165b866f94ea6be5a8d2a57c471a651e59c30bb..12529acd18af6f2d86a922c43435a1d9097b7062 100644

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

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

@@ -84,8 +84,8 @@ class WebContentsObserverBridge : public content::WebContentsObserver {

- (void)awakeFromNib {

// Load in the image

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

- NSImage* backgroundImage = rb.GetNativeImageNamed(IDR_FROZEN_TAB_ICON);

- DCHECK(backgroundImage);

+ NSImage* backgroundImage =

+ rb.GetNativeImageNamed(IDR_FROZEN_TAB_ICON).ToNSImage();

[imageView_ setImage:backgroundImage];

// Make the message fit.