chrome/browser/favicon/favicon_handler.cc - Issue 326143002: Remove ui::GetImageScale

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 326143002: Remove ui::GetImageScale (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix mac build Created 6 years, 6 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 56dd4c9c9c3a4051328a41ca75ab95668cee6425..423b19ce6605ad89c5ecfa9c75eb0962e95eb02f 100644

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

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

@@ -127,7 +127,7 @@ bool HasExpiredOrIncompleteResult(

FaviconUtil::GetFaviconScaleFactors();

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

int edge_size_in_pixel = floor(

- desired_size_in_dip * ui::GetImageScale(scale_factors[i]));

+ desired_size_in_dip * ui::GetScaleForScaleFactor(scale_factors[i]));

std::vector<gfx::Size>::iterator it = std::find(favicon_sizes.begin(),

favicon_sizes.end(), gfx::Size(edge_size_in_pixel, edge_size_in_pixel));

if (it == favicon_sizes.end())

« no previous file with comments | « no previous file | chrome/browser/favicon/favicon_service.cc » ('j') | no next file with comments »