chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm - Issue 6677051: fav icon -> favicon. Pass 8: content/

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 6677051: fav icon -> favicon. Pass 8: content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 9 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 d23fa87fac7abdd0dff5ab73c271ef6cfbee5489..5b47e3161ae95170e1e963d4dece78d1616712b7 100644

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

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

@@ -1260,7 +1260,7 @@ private:

TabController* tabController = [tabArray_ objectAtIndex:index];

bool oldHasIcon = [tabController iconView] != nil;

- bool newHasIcon = contents->ShouldDisplayFavIcon() ||

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

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

TabLoadingState oldState = [tabController loadingState];