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

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

Issue 2611623003: Use exact pixel sizes instead of dip in webapp/WebAPK installability code (Closed)
Patch Set: Rebased version of pkotwicz@'s original patch Created 3 years, 12 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
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..139511b750e1cf8c17314f8a5ee703b02105c065 100644
--- a/chrome/browser/manifest/manifest_icon_selector.cc
+++ b/chrome/browser/manifest/manifest_icon_selector.cc
@@ -13,8 +13,6 @@
#include "base/strings/utf_string_conversions.h"
#include "components/mime_util/mime_util.h"
#include "content/public/browser/web_contents.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
using content::Manifest;
@@ -130,14 +128,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 +142,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()));
-}
« no previous file with comments | « chrome/browser/manifest/manifest_icon_selector.h ('k') | chrome/browser/manifest/manifest_icon_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698