chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm - Issue 10853018: Fall back to the default favicon on invalid favicon files.

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/favicon_util_mac.mm

Issue 10853018: Fall back to the default favicon on invalid favicon files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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/favicon_util_mac.mm

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

index 77107f13b3fb2e4a66f858c79073f57a49635753..7cd60b2752c223f11b0ce60b64247a031886321f 100644

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

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

@@ -19,7 +19,7 @@ namespace mac {

NSImage* FaviconForTabContents(TabContents* contents) {

if (contents && contents->favicon_tab_helper()->FaviconIsValid()) {

- NSImage* image = contents->favicon_tab_helper()->GetFavicon().ToNSImage();

+ NSImage* image = contents->favicon_tab_helper()->GetFavicon().AsNSImage();

Nico 2012/08/05 04:44:48 (Also fixes a frequent crasher on mac that I intro

// The |image| could be nil if the bitmap is null. In that case, fallback

// to the default image.

if (image) {

« no previous file with comments | « no previous file | ui/gfx/image/image.h » ('j') | no next file with comments »