webapps: allow callers of icon downloader/selector to specify a minimum size

chrome/browser/android/banners/app_banner_manager_android.cc

Index: chrome/browser/android/banners/app_banner_manager_android.cc
diff --git a/chrome/browser/android/banners/app_banner_manager_android.cc b/chrome/browser/android/banners/app_banner_manager_android.cc
index 9caa50eb07218140752acf6179c80fb7f43c4a46..7da379868b800f6ec23e7e8fd12747f406c0e00f 100644
--- a/chrome/browser/android/banners/app_banner_manager_android.cc
+++ b/chrome/browser/android/banners/app_banner_manager_android.cc
@@ -9,6 +9,7 @@
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/android/banners/app_banner_data_fetcher_android.h"
+#include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/web_contents.h"
@@ -34,11 +35,16 @@ namespace banners {
 AppBannerManagerAndroid::AppBannerManagerAndroid(
     JNIEnv* env,
     jobject obj,
+    int ideal_icon_size_in_dp,
+    int minimum_icon_size_in_dp,
     int ideal_splash_image_size_in_dp,
-    int ideal_icon_size_in_dp)
-    : AppBannerManager(ideal_icon_size_in_dp),
-      ideal_splash_image_size_in_dp_(ideal_splash_image_size_in_dp),
-      weak_java_banner_view_manager_(env, obj) {
+    int minimum_splash_image_size_in_dp)
+    : AppBannerManager(),
+      weak_java_banner_view_manager_(env, obj),
+    ideal_icon_size_in_dp_(ideal_icon_size_in_dp),
+    minimum_icon_size_in_dp_(minimum_icon_size_in_dp),
+    ideal_splash_image_size_in_dp_(ideal_splash_image_size_in_dp),
+    minimum_splash_image_size_in_dp_(minimum_splash_image_size_in_dp) {
 }
 
 AppBannerManagerAndroid::~AppBannerManagerAndroid() {
@@ -93,9 +99,10 @@ bool AppBannerManagerAndroid::HandleNonWebApp(const std::string& platform,
       ConvertUTF8ToJavaString(env, id));
   ScopedJavaLocalRef<jstring> jreferrer(
       ConvertUTF8ToJavaString(env, referrer));
-  Java_AppBannerManager_fetchAppDetails(env, jobj.obj(), jurl.obj(),
-                                        jpackage.obj(), jreferrer.obj(),
-                                        ideal_icon_size_in_dp());
+  Java_AppBannerManager_fetchAppDetails(
+      env, jobj.obj(), jurl.obj(),
+      jpackage.obj(), jreferrer.obj(),
+      ideal_icon_size_in_dp_);
   return true;
 }
 
@@ -143,11 +150,14 @@ std::string AppBannerManagerAndroid::ExtractQueryValueForName(
 }
 
 AppBannerDataFetcher* AppBannerManagerAndroid::CreateAppBannerDataFetcher(
-    base::WeakPtr<Delegate> weak_delegate,
-    const int ideal_icon_size_in_dp) {
-  return new AppBannerDataFetcherAndroid(web_contents(), weak_delegate,
-                                         ideal_splash_image_size_in_dp_,
-                                         ideal_icon_size_in_dp);
+    base::WeakPtr<Delegate> weak_delegate) {
+  return new AppBannerDataFetcherAndroid(
+      web_contents(),
+      weak_delegate,
+      ideal_icon_size_in_dp_,
+      minimum_icon_size_in_dp_,
+      ideal_splash_image_size_in_dp_,
+      minimum_splash_image_size_in_dp_);
 }
 
 bool AppBannerManagerAndroid::OnAppDetailsRetrieved(JNIEnv* env,
@@ -182,11 +192,15 @@ bool AppBannerManagerAndroid::Register(JNIEnv* env) {
 
 jlong Init(JNIEnv* env,
            const JavaParamRef<jobject>& obj,
-           jint ideal_splash_image_size_in_dp,
-           jint ideal_icon_size_in_dp) {
+           int ideal_icon_size_in_dp,
+           int minimum_icon_size_in_dp,
+           int ideal_splash_image_size_in_dp,
+           int minimum_splash_image_size_in_dp) {
   AppBannerManagerAndroid* manager =
-      new AppBannerManagerAndroid(env, obj,
-          ideal_splash_image_size_in_dp, ideal_icon_size_in_dp);
+      new AppBannerManagerAndroid(
+          env, obj,
+          ideal_icon_size_in_dp, minimum_icon_size_in_dp,
+          ideal_splash_image_size_in_dp, minimum_splash_image_size_in_dp);
   return reinterpret_cast<intptr_t>(manager);
 }