chrome/browser/ui/cocoa/tabs/tab_strip_controller.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/tabs/tab_strip_controller.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/tabs/tab_strip_controller.mm

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

index 594150985e15f101f44d132d4d3f20f379376b6b..12659d6e1bb5386cc192462a2a075410e7d6d290 100644

--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

@@ -1466,8 +1466,10 @@ private:

NSInteger index = [self indexFromModelIndex:modelIndex];

TabController* tabController = [tabArray_ objectAtIndex:index];

+ FaviconTabHelper* favicon_tab_helper =

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

bool oldHasIcon = [tabController iconView] != nil;

- bool newHasIcon = contents->favicon_tab_helper()->ShouldDisplayFavicon() ||

+ bool newHasIcon = favicon_tab_helper->ShouldDisplayFavicon() ||

tabStripModel_->IsMiniTab(modelIndex); // Always show icon if mini.

TabLoadingState oldState = [tabController loadingState];