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

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 "base/android/jni_android.h"
 #include "base/android/jni_string.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"
 #include "content/public/common/frame_navigate_params.h"
 #include "jni/AppBannerManager_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 
 namespace {
 
 const char kPlayPlatform[] = "play";
 const char kReferrerName[] = "referrer";
 const char kIdName[] = "id";
 const char kPlayInlineReferrer[] = "playinline=chrome_inline";
 
 }  // anonymous namespace
 
 namespace banners {
 
 AppBannerManagerAndroid::AppBannerManagerAndroid(
     JNIEnv* env,
-    jobject obj,
-    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),
+    jobject obj)
+    : AppBannerManager(),
       weak_java_banner_view_manager_(env, obj) {
 }
 
 AppBannerManagerAndroid::~AppBannerManagerAndroid() {
 }
 
 void AppBannerManagerAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
@@ skipping 35 matching lines @@
     referrer = kPlayInlineReferrer;
   else
     referrer.append("&").append(kPlayInlineReferrer);
 
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, data_fetcher()->validated_url().spec()));
   ScopedJavaLocalRef<jstring> jpackage(
       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(),
+      ShortcutHelper::GetIdealHomescreenIconSizeInDp());
   return true;
 }
 
 bool AppBannerManagerAndroid::CheckPlatformAndId(const std::string& platform,
                                                  const std::string& id) {
   if (platform != kPlayPlatform) {
     banners::OutputDeveloperDebugMessage(
         web_contents(), platform + banners::kIgnoredNotSupportedOnAndroid);
     return false;
   }
@@ skipping 27 matching lines @@
   while (url::ExtractQueryKeyValue(url_spec, &query, &key, &value)) {
     std::string key_str(url_spec, key.begin, key.len);
     std::string value_str(url_spec, value.begin, value.len);
     if (key_str == name)
       return value_str;
   }
   return "";
 }
 
 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,
+      ShortcutHelper::GetIdealHomescreenIconSizeInDp(),
+      ShortcutHelper::GetMinimumHomescreenIconSizeInDp(),
+      ShortcutHelper::GetIdealSplashImageSizeInDp(),
+      ShortcutHelper::GetMinimumSplashImageSizeInDp());
 }
 
 bool AppBannerManagerAndroid::OnAppDetailsRetrieved(JNIEnv* env,
                                                     jobject obj,
                                                     jobject japp_data,
                                                     jstring japp_title,
                                                     jstring japp_package,
                                                     jstring jicon_url) {
   if (!CheckFetcherMatchesContents())
     return false;
@@ skipping 13 matching lines @@
 bool AppBannerManagerAndroid::IsFetcherActive(JNIEnv* env, jobject obj) {
   return AppBannerManager::IsFetcherActive();
 }
 
 // static
 bool AppBannerManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 jlong Init(JNIEnv* env,
-           const JavaParamRef<jobject>& obj,
-           jint ideal_splash_image_size_in_dp,
-           jint ideal_icon_size_in_dp) {
-  AppBannerManagerAndroid* manager =
-      new AppBannerManagerAndroid(env, obj,
-          ideal_splash_image_size_in_dp, ideal_icon_size_in_dp);
+           const JavaParamRef<jobject>& obj) {
+  AppBannerManagerAndroid* manager = new AppBannerManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(manager);
 }
 
 void SetTimeDeltaForTesting(JNIEnv* env,
                             const JavaParamRef<jclass>& clazz,
                             jint days) {
   AppBannerDataFetcher::SetTimeDeltaForTesting(days);
 }
 
 void DisableSecureSchemeCheckForTesting(JNIEnv* env,
                                         const JavaParamRef<jclass>& clazz) {
   AppBannerManager::DisableSecureSchemeCheckForTesting();
 }
 
 void SetEngagementWeights(JNIEnv* env,
                           const JavaParamRef<jclass>& clazz,
                           jdouble direct_engagement,
                           jdouble indirect_engagement) {
   AppBannerManager::SetEngagementWeights(direct_engagement,
                                          indirect_engagement);
 }
 
 }  // namespace banners