chrome/browser/ui/touch/tabs/touch_tab.cc - Issue 6681041: fav icon -> favicon. Pass 3: kFavIconSize -> kFaviconSize

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/touch/tabs/touch_tab.cc

Issue 6681041: fav icon -> favicon. Pass 3: kFavIconSize -> kFaviconSize (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/touch/tabs/touch_tab.cc

diff --git a/chrome/browser/ui/touch/tabs/touch_tab.cc b/chrome/browser/ui/touch/tabs/touch_tab.cc

index 69be10d4eca123e1dc6e077b4ff8ac13673ca4a7..e2968c1a2e6f900a49862811d923b9baa3dff1aa 100644

--- a/chrome/browser/ui/touch/tabs/touch_tab.cc

+++ b/chrome/browser/ui/touch/tabs/touch_tab.cc

@@ -172,12 +172,12 @@ void TouchTab::PaintIcon(gfx::Canvas* canvas) {

if (base::i18n::IsRTL()) {

x = width() - x -

- (data().favicon.isNull() ? kFavIconSize : data().favicon.width());

+ (data().favicon.isNull() ? kFaviconSize : data().favicon.width());

}

int favicon_x = x;

- if (!data().favicon.isNull() && data().favicon.width() != kFavIconSize)

- favicon_x += (data().favicon.width() - kFavIconSize) / 2;

+ if (!data().favicon.isNull() && data().favicon.width() != kFaviconSize)

+ favicon_x += (data().favicon.width() - kFaviconSize) / 2;

if (data().network_state != TabRendererData::NETWORK_STATE_NONE) {

ThemeProvider* tp = GetThemeProvider();