Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5855)

Unified Diff: chrome/browser/manifest/manifest_icon_selector.cc

Issue 2589503002: Use exact pixel sizes instead of dip in webapp/WebAPK installability code (Closed)
Patch Set: Created 4 years 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
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 faae55d8a15c2e13b640e240265afe69e41ad8bd..c8d3d5566a9a1adcc83b8daca1d4ec815073a629 100644
--- a/chrome/browser/manifest/manifest_icon_selector.cc
+++ b/chrome/browser/manifest/manifest_icon_selector.cc
@@ -130,14 +130,9 @@ std::vector<Manifest::Icon> ManifestIconSelector::FilterIconsByType(
// static
GURL ManifestIconSelector::FindBestMatchingIcon(
const std::vector<Manifest::Icon>& unfiltered_icons,
- const int ideal_icon_size_in_dp,
- const int minimum_icon_size_in_dp) {
- DCHECK(minimum_icon_size_in_dp <= ideal_icon_size_in_dp);
-
- const int ideal_icon_size_in_px =
- ConvertIconSizeFromDpToPx(ideal_icon_size_in_dp);
- const int minimum_icon_size_in_px =
- ConvertIconSizeFromDpToPx(minimum_icon_size_in_dp);
+ const int ideal_icon_size_in_px,
+ const int minimum_icon_size_in_px) {
+ DCHECK(minimum_icon_size_in_px <= ideal_icon_size_in_px);
std::vector<Manifest::Icon> icons =
ManifestIconSelector::FilterIconsByType(unfiltered_icons);
@@ -149,10 +144,3 @@ GURL ManifestIconSelector::FindBestMatchingIcon(
return GURL();
return icons[index].src;
}
-
-// static
-int ManifestIconSelector::ConvertIconSizeFromDpToPx(int icon_size_in_dp) {
- return static_cast<int>(round(
- icon_size_in_dp *
- display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor()));
-}

Powered by Google App Engine
This is Rietveld 408576698