Make minimum PWA icon size the same accross all device densities

chrome/browser/android/banners/app_banner_manager_android.cc

 // Copyright 2015 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/android/banners/app_banner_manager_android.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/android/jni_android.h"
@@ skipping 32 matching lines @@
   auto shortcut_info = base::MakeUnique<ShortcutInfo>(GURL());
   if (!manifest.IsEmpty()) {
     shortcut_info->UpdateFromManifest(manifest);
     shortcut_info->manifest_url = manifest_url;
     shortcut_info->best_primary_icon_url = icon_url;
     shortcut_info->UpdateSource(ShortcutInfo::SOURCE_APP_BANNER);
   }
 
   shortcut_info->ideal_splash_image_size_in_px =
       ShortcutHelper::GetIdealSplashImageSizeInPx();
-  shortcut_info->minimum_splash_image_size_in_px =
-      ShortcutHelper::GetMinimumSplashImageSizeInPx();
   shortcut_info->splash_image_url = ManifestIconSelector::FindBestMatchingIcon(
       manifest.icons, shortcut_info->ideal_splash_image_size_in_px,
-      shortcut_info->minimum_splash_image_size_in_px,
+      InstallableManager::GetMinimumIconSizeInPx(),
       content::Manifest::Icon::IconPurpose::ANY);
 
   return shortcut_info;
 }
 
 }  // anonymous namespace
 
 namespace banners {
 
 AppBannerManagerAndroid::AppBannerManagerAndroid(
@@ skipping 30 matching lines @@
   native_app_data_.Reset(japp_data);
   app_title_ = ConvertJavaStringToUTF16(env, japp_title);
   native_app_package_ = ConvertJavaStringToUTF8(env, japp_package);
   primary_icon_url_ = GURL(ConvertJavaStringToUTF8(env, jicon_url));
 
   if (!CheckIfShouldShowBanner())
     return false;
 
   return ManifestIconDownloader::Download(
       web_contents(), primary_icon_url_, GetIdealPrimaryIconSizeInPx(),
-      GetMinimumPrimaryIconSizeInPx(),
+      InstallableManager::GetMinimumIconSizeInPx(),
       base::Bind(&AppBannerManager::OnAppIconFetched, GetWeakPtr()));
 }
 
 void AppBannerManagerAndroid::RequestAppBanner(const GURL& validated_url,
                                                bool is_debug_mode) {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!Java_AppBannerManager_isEnabledForTab(env, java_banner_manager_))
     return;
 
   AppBannerManager::RequestAppBanner(validated_url, is_debug_mode);
@@ skipping 10 matching lines @@
 
 std::string AppBannerManagerAndroid::GetBannerType() {
   return native_app_data_.is_null() ? AppBannerManager::GetBannerType()
                                     : "play";
 }
 
 int AppBannerManagerAndroid::GetIdealPrimaryIconSizeInPx() {
   return ShortcutHelper::GetIdealHomescreenIconSizeInPx();
 }
 
-int AppBannerManagerAndroid::GetMinimumPrimaryIconSizeInPx() {
-  return ShortcutHelper::GetMinimumHomescreenIconSizeInPx();
-}
-
 bool AppBannerManagerAndroid::IsWebAppInstalled(
     content::BrowserContext* browser_context,
     const GURL& start_url,
     const GURL& manifest_url) {
   // Returns true if a WebAPK is installed or is being installed.
   // Does not check whether a non-WebAPK web app is installed: this is detected
   // by the content settings check in AppBannerSettingsHelper::ShouldShowBanner
   // (due to the lack of an API to detect what is and isn't on the Android
   // homescreen). This method will still detect the presence of a WebAPK even if
   // Chrome's data is cleared.
   return ShortcutHelper::IsWebApkInstalled(browser_context, start_url,
                                            manifest_url);
 }
 
 InstallableParams AppBannerManagerAndroid::ParamsToPerformInstallableCheck() {
   InstallableParams params =
       AppBannerManager::ParamsToPerformInstallableCheck();
 
   if (can_install_webapk_) {
     params.ideal_badge_icon_size_in_px = GetIdealBadgeIconSizeInPx();
-    params.minimum_badge_icon_size_in_px = GetIdealBadgeIconSizeInPx();
     params.fetch_valid_badge_icon = true;
   }
 
   return params;
 }
 
 void AppBannerManagerAndroid::PerformInstallableCheck() {
   // Check if the manifest prefers that we show a native app banner. If so, call
   // to Java to verify the details.
   if (manifest_.prefer_related_applications &&
@@ skipping 182 matching lines @@
 }
 
 // static
 void SetTotalEngagementToTrigger(JNIEnv* env,
                                  const JavaParamRef<jclass>& clazz,
                                  jdouble engagement) {
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(engagement);
 }
 
 }  // namespace banners