Make minimum PWA icon size the same accross all device densities

chrome/browser/installable/installable_manager.cc

Index: chrome/browser/installable/installable_manager.cc
diff --git a/chrome/browser/installable/installable_manager.cc b/chrome/browser/installable/installable_manager.cc
index b0bf4496513b77bdd42977cfe2e53435a498d2dc..b90bcf073d65cc9295b2887088db7f105db57ba5 100644
--- a/chrome/browser/installable/installable_manager.cc
+++ b/chrome/browser/installable/installable_manager.cc
@@ -142,16 +142,12 @@ void InstallableManager::GetData(const InstallableParams& params,
 
 InstallableManager::IconParams InstallableManager::ParamsForPrimaryIcon(
     const InstallableParams& params) const {
-  return std::make_tuple(params.ideal_primary_icon_size_in_px,
-                         params.minimum_primary_icon_size_in_px,
-                         IconPurpose::ANY);
+  return std::make_pair(params.ideal_primary_icon_size_in_px, IconPurpose::ANY);
 }
 
 InstallableManager::IconParams InstallableManager::ParamsForBadgeIcon(
     const InstallableParams& params) const {
-  return std::make_tuple(params.ideal_badge_icon_size_in_px,
-                         params.minimum_badge_icon_size_in_px,
-                         IconPurpose::BADGE);
+  return std::make_pair(params.ideal_badge_icon_size_in_px, IconPurpose::BADGE);
 }
 
 bool InstallableManager::IsIconFetched(const IconParams& params) const {
@@ -438,9 +434,12 @@ void InstallableManager::OnDidCheckHasServiceWorker(
 void InstallableManager::CheckAndFetchBestIcon(const IconParams& params) {
   DCHECK(!manifest().IsEmpty());
 
-  int ideal_icon_size_in_px = std::get<0>(params);
-  int minimum_icon_size_in_px = std::get<1>(params);
-  IconPurpose icon_purpose = std::get<2>(params);
+  int ideal_icon_size_in_px = params.first;
+  IconPurpose icon_purpose = params.second;
+
+  int minimum_icon_size_in_px = (icon_purpose == IconPurpose::BADGE)

[Xi Han, 2017/04/03 18:24:58]

If the |icon_purpose| == IconPurpose::BADGE, I think we should check whether
|ideal_icon_size_in_px| >= |kIconMinimumSizeInPx| and picks up the bigger one.
Is this already checked in any other place?

[pkotwicz, 2017/04/05 04:29:07]

kIconMinimumSizeInPx is 144px. Badges are smaller than that :)

[Xi Han, 2017/04/05 15:19:27]

I see, thanks!

+                                    ? ideal_icon_size_in_px
+                                    : kIconMinimumSizeInPx;
 
   IconProperty& icon = icons_[params];
   icon.fetched = true;