chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm - Issue 11011002: Switch FaviconTabHelper to use WebContentsUserData.

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 11011002: Switch FaviconTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix 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/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 8112860088dfcf58394fdecb1465fd962367f83a..719a60245526601ed35c5cc29c805897048d6433 100644

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

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

@@ -12,8 +12,11 @@

namespace mac {

NSImage* FaviconForTabContents(TabContents* contents) {

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

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

+ FaviconTabHelper* favicon_tab_helper =

+ contents ? FaviconTabHelper::FromWebContents(contents->web_contents())

+ : NULL;

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

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

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

// to the default image.

if (image) {