webapps: allow callers of icon downloader/selector to specify a minimum size

chrome/browser/manifest/manifest_icon_selector.cc

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 5d9cb593e57520e32b7aa97adbdacf67247ad1fe..831900261aaeed8ee8d8fc8bd5f4d0314092b9ee 100644
--- a/chrome/browser/manifest/manifest_icon_selector.cc
+++ b/chrome/browser/manifest/manifest_icon_selector.cc
@@ -164,15 +164,14 @@ std::vector<Manifest::Icon> ManifestIconSelector::FilterIconsByType(
 GURL ManifestIconSelector::FindBestMatchingIcon(
     const std::vector<Manifest::Icon>& unfiltered_icons,
     const int ideal_icon_size_in_dp,
+    const int minimum_icon_size_in_dp,
     const gfx::Screen* screen) {
   const float device_scale_factor =
       screen->GetPrimaryDisplay().device_scale_factor();
-  const int ideal_icon_size_in_px =
-      static_cast<int>(round(ideal_icon_size_in_dp * device_scale_factor));
-
-  const float minimum_scale_factor = std::max(device_scale_factor - 1, 1.0f);
-  const int minimum_icon_size_in_px =
-      static_cast<int>(round(ideal_icon_size_in_dp * minimum_scale_factor));
+  const float ideal_icon_size_in_px =
+      ideal_icon_size_in_dp * device_scale_factor;

[gone, 2015/09/14 23:03:32]

Why did you stop rounding?

[Lalit Maganti, 2015/09/15 16:59:04]

Tiredness when resolving merge conflicts = silly stuff like this.

Fixed the same issue in downloader as well.

+  const float minimum_icon_size_in_px =
+      minimum_icon_size_in_dp * device_scale_factor;
 
   std::vector<Manifest::Icon> icons =
       ManifestIconSelector::FilterIconsByType(unfiltered_icons);