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

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

index 8623df2e9b911e45d0f7a40c76af9690793ad6cb..288702d7322497e57f05eaf89a62904ca5c59162 100644

--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm

+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm

@@ -34,8 +34,7 @@ static const CGFloat kTabHorzMargin = 13;

- (void)awakeFromNib {

// Load resource for image and set it.

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

- NSImage* image = rb.GetNativeImageNamed(IDR_SAD_TAB);

- DCHECK(image);

+ NSImage* image = rb.GetNativeImageNamed(IDR_SAD_TAB).ToNSImage();

[image_ setImage:image];

// Set font for title.