chrome/browser/favicon/favicon_handler.cc - Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx

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/favicon/favicon_handler.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/favicon/favicon_handler.cc

diff --git a/chrome/browser/favicon/favicon_handler.cc b/chrome/browser/favicon/favicon_handler.cc

index 881008dbb39df3b1d1ebc42be5aae5cae780f7de..9c75b51f0fb0f2372fa9cadaf42d83a34720cf7c 100644

--- a/chrome/browser/favicon/favicon_handler.cc

+++ b/chrome/browser/favicon/favicon_handler.cc

@@ -67,7 +67,7 @@ int GetMaximalIconSize(chrome::IconType icon_type) {

base_size = 0;

break;

}

- return ui::GetScaleFactorScale(ui::GetMaxScaleFactor()) * base_size;

+ return gfx::ImageSkia::GetMaxSupportedScale() * base_size;

}

bool DoUrlAndIconMatch(const FaviconURL& favicon_url,