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

Unified Diff: chrome/browser/installable/installable_manager.cc

Issue 2773353002: Make minimum PWA icon size the same accross all device densities
Patch Set: Merge branch 'master' into min_size Created 3 years, 8 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/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)
+ ? ideal_icon_size_in_px
+ : kIconMinimumSizeInPx;
IconProperty& icon = icons_[params];
icon.fetched = true;

Powered by Google App Engine
This is Rietveld 408576698