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

chrome/browser/manifest/manifest_icon_downloader.cc

Index: chrome/browser/manifest/manifest_icon_downloader.cc
diff --git a/chrome/browser/manifest/manifest_icon_downloader.cc b/chrome/browser/manifest/manifest_icon_downloader.cc
index b5a22bd80318de2a84b943bc746aadd502899b52..08e81f2a2d827932f51d38e04e25ed4c708ddb0b 100644
--- a/chrome/browser/manifest/manifest_icon_downloader.cc
+++ b/chrome/browser/manifest/manifest_icon_downloader.cc
@@ -16,6 +16,7 @@ bool ManifestIconDownloader::Download(
     content::WebContents* web_contents,
     const GURL& icon_url,
     int ideal_icon_size_in_dp,
+    int minimum_icon_size_in_dp,
     const ManifestIconDownloader::IconFetchCallback& callback) {
   if (!web_contents || !icon_url.is_valid())

[mlamouri (slow - plz ping), 2015/09/16 09:58:29]

Please add a DCHECK() checking that ideal >= minimum.

[Lalit Maganti, 2015/09/16 11:45:26]

Done.

     return false;
@@ -27,10 +28,8 @@ bool ManifestIconDownloader::Download(
       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));
+      static_cast<int>(round(minimum_icon_size_in_dp * device_scale_factor));
 
   web_contents->DownloadImage(
       icon_url,