chrome/browser/extensions/extension_web_ui.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/extensions/extension_web_ui.cc

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

Patch Set: Fix new usage of scale in FastShowPickler 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/extensions/extension_web_ui.cc

diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc

index 40a4debf14c8d985867b159d5126481399df7ba5..631ba560a777f31a47d20d6220813e9b18880dfb 100644

--- a/chrome/browser/extensions/extension_web_ui.cc

+++ b/chrome/browser/extensions/extension_web_ui.cc

@@ -404,7 +404,7 @@ void ExtensionWebUI::GetFaviconForURL(

FaviconUtil::GetFaviconScaleFactors();

std::vector<extensions::ImageLoader::ImageRepresentation> info_list;

for (size_t i = 0; i < scale_factors.size(); ++i) {

- float scale = ui::GetScaleFactorScale(scale_factors[i]);

+ float scale = ui::GetImageScale(scale_factors[i]);

int pixel_size = static_cast<int>(gfx::kFaviconSize * scale);

extensions::ExtensionResource icon_resource =

extensions::IconsInfo::GetIconResource(extension,