Make minimum PWA icon size the same accross all device densities

chrome/browser/android/shortcut_helper.cc

 // Copyright 2013 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/shortcut_helper.h"
 
 #include <jni.h>
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/guid.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/android/webapk/chrome_webapk_host.h"
 #include "chrome/browser/android/webapk/webapk_install_service.h"
 #include "chrome/browser/android/webapk/webapk_metrics.h"
+#include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ShortcutHelper_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/color_analysis.h"
 #include "url/gurl.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 using content::Manifest;
 
 namespace {
 
 int g_ideal_homescreen_icon_size = -1;
-int g_minimum_homescreen_icon_size = -1;
 int g_ideal_splash_image_size = -1;
-int g_minimum_splash_image_size = -1;
 int g_ideal_badge_icon_size = -1;
 
 int g_default_rgb_icon_value = 145;
 
 // Retrieves and caches the ideal and minimum sizes of the Home screen icon
 // and the splash screen image.
 void GetHomescreenIconAndSplashImageSizes() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jintArray> java_size_array =
       Java_ShortcutHelper_getHomeScreenIconAndSplashImageSizes(env);
   std::vector<int> sizes;
   base::android::JavaIntArrayToIntVector(env, java_size_array.obj(), &sizes);
 
   // Check that the size returned is what is expected.
-  DCHECK(sizes.size() == 5);
+  DCHECK(sizes.size() == 3);
 
   // This ordering must be kept up to date with the Java ShortcutHelper.
-  g_ideal_homescreen_icon_size = sizes[0];
-  g_minimum_homescreen_icon_size = sizes[1];
-  g_ideal_splash_image_size = sizes[2];
-  g_minimum_splash_image_size = sizes[3];
-  g_ideal_badge_icon_size = sizes[4];
-
-  // Try to ensure that the data returned is sane.
-  DCHECK(g_minimum_homescreen_icon_size <= g_ideal_homescreen_icon_size);
-  DCHECK(g_minimum_splash_image_size <= g_ideal_splash_image_size);
+  g_ideal_homescreen_icon_size =
+      std::max(sizes[0], InstallableManager::GetMinimumIconSizeInPx());
+  g_ideal_splash_image_size =
+      std::max(sizes[1], InstallableManager::GetMinimumIconSizeInPx());
+  g_ideal_badge_icon_size = sizes[2];
 }
 
 // Adds a shortcut which opens in a fullscreen window to the launcher.
 // |splash_image_callback| will be invoked once the Java-side operation has
 // completed. This is necessary as Java will asynchronously create and
 // populate a WebappDataStorage object for standalone-capable sites. This must
 // exist before the splash image can be stored.
 void AddWebappWithSkBitmap(const ShortcutInfo& info,
                            const std::string& webapp_id,
                            const SkBitmap& icon_bitmap,
@@ skipping 59 matching lines @@
     content::WebContents* web_contents,
     const ShortcutInfo& info,
     const SkBitmap& icon_bitmap) {
   std::string webapp_id = base::GenerateGUID();
   if (info.display == blink::WebDisplayModeStandalone ||
       info.display == blink::WebDisplayModeFullscreen) {
     AddWebappWithSkBitmap(
         info, webapp_id, icon_bitmap,
         base::Bind(&ShortcutHelper::FetchSplashScreenImage, web_contents,
                    info.splash_image_url, info.ideal_splash_image_size_in_px,
-                   info.minimum_splash_image_size_in_px, webapp_id));
+                   webapp_id));
     GooglePlayInstallState state =
         ChromeWebApkHost::GetGooglePlayInstallState();
     if (state != GooglePlayInstallState::SUPPORTED)
       webapk::TrackGooglePlayInstallState(state);
     return;
   }
   AddShortcutWithSkBitmap(info, webapp_id, icon_bitmap);
 }
 
 // static
@@ skipping 16 matching lines @@
   Java_ShortcutHelper_showWebApkInstallInProgressToast(
       base::android::AttachCurrentThread());
 }
 
 int ShortcutHelper::GetIdealHomescreenIconSizeInPx() {
   if (g_ideal_homescreen_icon_size == -1)
     GetHomescreenIconAndSplashImageSizes();
   return g_ideal_homescreen_icon_size;
 }
 
-int ShortcutHelper::GetMinimumHomescreenIconSizeInPx() {
-  if (g_minimum_homescreen_icon_size == -1)
-    GetHomescreenIconAndSplashImageSizes();
-  return g_minimum_homescreen_icon_size;
-}
-
 int ShortcutHelper::GetIdealSplashImageSizeInPx() {
   if (g_ideal_splash_image_size == -1)
     GetHomescreenIconAndSplashImageSizes();
   return g_ideal_splash_image_size;
 }
 
-int ShortcutHelper::GetMinimumSplashImageSizeInPx() {
-  if (g_minimum_splash_image_size == -1)
-    GetHomescreenIconAndSplashImageSizes();
-  return g_minimum_splash_image_size;
-}
-
 int ShortcutHelper::GetIdealBadgeIconSizeInPx() {
   if (g_ideal_badge_icon_size == -1)
     GetHomescreenIconAndSplashImageSizes();
   return g_ideal_badge_icon_size;
 }
 
 // static
 void ShortcutHelper::FetchSplashScreenImage(
     content::WebContents* web_contents,
     const GURL& image_url,
     const int ideal_splash_image_size_in_px,
-    const int minimum_splash_image_size_in_px,
     const std::string& webapp_id) {
   // This is a fire and forget task. It is not vital for the splash screen image
   // to be downloaded so if the downloader returns false there is no fallback.
   ManifestIconDownloader::Download(
       web_contents, image_url, ideal_splash_image_size_in_px,
-      minimum_splash_image_size_in_px,
+      InstallableManager::GetMinimumIconSizeInPx(),
       base::Bind(&ShortcutHelper::StoreWebappSplashImage, webapp_id));
 }
 
 // static
 void ShortcutHelper::StoreWebappSplashImage(const std::string& webapp_id,
                                             const SkBitmap& splash_image) {
   if (splash_image.drawsNothing())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
@@ skipping 184 matching lines @@
 
   ShortcutHelper::WebApkInfoCallback* webapk_list_callback =
       reinterpret_cast<ShortcutHelper::WebApkInfoCallback*>(jcallback_pointer);
   webapk_list_callback->Run(webapk_list);
   delete webapk_list_callback;
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }