Make minimum PWA icon size the same accross all device densities

chrome/browser/installable/installable_manager.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/installable/installable_manager.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
@@ skipping 124 matching lines @@
   tasks_.push_back({params, callback});
   if (is_active_)
     return;
 
   is_active_ = true;
   StartNextTask();
 }
 
 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 {
   const auto it = icons_.find(params);
   return it != icons_.end() && it->second.fetched;
 }
 
 void InstallableManager::SetIconFetched(const IconParams& params) {
   icons_[params].fetched = true;
 }
@@ skipping 266 matching lines @@
       break;
   }
 
   installable_->fetched = true;
   WorkOnTask();
 }
 
 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;
 
   GURL icon_url = ManifestIconSelector::FindBestMatchingIcon(
       manifest().icons, ideal_icon_size_in_px, minimum_icon_size_in_px,
       icon_purpose);
 
   if (icon_url.is_empty()) {
     icon.error = NO_ACCEPTABLE_ICON;
@@ skipping 45 matching lines @@
   return manifest_->url;
 }
 
 const content::Manifest& InstallableManager::manifest() const {
   return manifest_->manifest;
 }
 
 bool InstallableManager::is_installable() const {
   return installable_->installable;
 }