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

chrome/browser/android/webapps/add_to_homescreen_dialog_helper.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/webapps/add_to_homescreen_dialog_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/manifest.h"
 #include "jni/AddToHomescreenDialogHelper_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/color_analysis.h"
 #include "url/gurl.h"
 
 using content::Manifest;
 
 jlong Initialize(JNIEnv* env,
                  const JavaParamRef<jobject>& obj,
-                 const JavaParamRef<jobject>& java_web_contents,
-                 jint ideal_splash_image_size_in_dp,
-                 jint ideal_icon_size_in_dp) {
+                 const JavaParamRef<jobject>& java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   AddToHomescreenDialogHelper* add_to_homescreen_helper =
-      new AddToHomescreenDialogHelper(env, obj, web_contents,
-          ideal_splash_image_size_in_dp, ideal_icon_size_in_dp);
+      new AddToHomescreenDialogHelper(env, obj, web_contents);
   return reinterpret_cast<intptr_t>(add_to_homescreen_helper);
 }
 
 AddToHomescreenDialogHelper::AddToHomescreenDialogHelper(
     JNIEnv* env,
     jobject obj,
-    content::WebContents* web_contents,
-    int ideal_splash_image_size_in_dp,
-    int ideal_icon_size_in_dp)
+    content::WebContents* web_contents)
     : add_shortcut_pending_(false),
       data_fetcher_(new AddToHomescreenDataFetcher(web_contents,
-          ideal_splash_image_size_in_dp,
-          ideal_icon_size_in_dp,
+          ShortcutHelper::GetIdealHomescreenIconSizeInDp(),
+          ShortcutHelper::GetMinimumHomescreenIconSizeInDp(),
+          ShortcutHelper::GetIdealSplashImageSizeInDp(),
+          ShortcutHelper::GetMinimumSplashImageSizeInDp(),
           this)) {
   java_ref_.Reset(env, obj);
 }
 
 AddToHomescreenDialogHelper::~AddToHomescreenDialogHelper() {
   data_fetcher_->set_weak_observer(nullptr);
   data_fetcher_ = nullptr;
 }
 
 void AddToHomescreenDialogHelper::OnUserTitleAvailable(
@@ skipping 104 matching lines @@
   content::WebContents* web_contents = data_fetcher_->web_contents();
   if (!web_contents)
     return;
 
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents, web_contents->GetURL(),
       data_fetcher_->shortcut_info().url.spec(),
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
       base::Time::Now());
 }