chrome/browser/manifest/manifest_icon_selector.cc - Issue 1308533006: webapps: allow callers of icon downloader/selector to specify a minimum size

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/manifest/manifest_icon_selector.cc

Issue 1308533006: webapps: allow callers of icon downloader/selector to specify a minimum size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@webapps-splashscreen-icon

Patch Set: Fix non-compiling test Created 5 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/banners/app_banner_manager_desktop.cc ('K') | « chrome/browser/manifest/manifest_icon_selector.h ('k') | chrome/browser/manifest/manifest_icon_selector_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/manifest/manifest_icon_selector.cc

diff --git a/chrome/browser/manifest/manifest_icon_selector.cc b/chrome/browser/manifest/manifest_icon_selector.cc

index 67f9024c47ad8a5508585c0f04cc4f0d96bc83a8..135c7f9b08c3fadb521c3dda0211482dd80fb0dd 100644

--- a/chrome/browser/manifest/manifest_icon_selector.cc

+++ b/chrome/browser/manifest/manifest_icon_selector.cc

@@ -164,16 +164,14 @@ std::vector<Manifest::Icon> ManifestIconSelector::FilterIconsByType(

GURL ManifestIconSelector::FindBestMatchingIcon(

const std::vector<Manifest::Icon>& unfiltered_icons,

const float preferred_icon_size_in_dp,

+ const float minimum_icon_size_in_dp,

const gfx::Screen* screen) {

const float device_scale_factor =

screen->GetPrimaryDisplay().device_scale_factor();

const float preferred_icon_size_in_pixels =

preferred_icon_size_in_dp * device_scale_factor;

- const int minimum_scale_factor = std::max(

- static_cast<int>(floor(device_scale_factor - 1)), 1);

const float minimum_icon_size_in_pixels =

- preferred_icon_size_in_dp * minimum_scale_factor;

+ minimum_icon_size_in_dp * device_scale_factor;

std::vector<Manifest::Icon> icons =

ManifestIconSelector::FilterIconsByType(unfiltered_icons);