[WebAPKs]: Reduce the parameters of ShortcutHelper::AddToLauncherWithSkBitmap()

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 21 matching lines @@
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(banners::AppBannerManagerAndroid);
 
 namespace {
 
 std::unique_ptr<ShortcutInfo> CreateShortcutInfo(
     const GURL& manifest_url,
     const content::Manifest& manifest,
-    const GURL& icon_url) {
+    const GURL& icon_url,
+    const GURL& splash_image_url,
+    int ideal_splash_image_size_in_px,
+    int minimum_splash_image_size_in_px) {
   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->splash_image_url = splash_image_url;
+  shortcut_info->ideal_splash_image_size_in_px = ideal_splash_image_size_in_px;
+  shortcut_info->minimum_splash_image_size_in_px =
+      minimum_splash_image_size_in_px;
   return shortcut_info;
 }
 
 }  // anonymous namespace
 
 namespace banners {
 
 AppBannerManagerAndroid::AppBannerManagerAndroid(
     content::WebContents* web_contents)
     : AppBannerManager(web_contents) {
   can_install_webapk_ = ChromeWebApkHost::CanInstallWebApk();
   CreateJavaBannerManager();
 }
 
 AppBannerManagerAndroid::~AppBannerManagerAndroid() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_AppBannerManager_destroy(env, java_banner_manager_);
   java_banner_manager_.Reset();
 }
 
-base::Closure AppBannerManagerAndroid::FetchWebappSplashScreenImageCallback(
-    const std::string& webapp_id) {
-  content::WebContents* contents = web_contents();
-  DCHECK(contents);
-
-  int ideal_splash_image_size_in_px =
-      ShortcutHelper::GetIdealSplashImageSizeInPx();
-  int minimum_splash_image_size_in_px =
-      ShortcutHelper::GetMinimumSplashImageSizeInPx();
-  GURL image_url = ManifestIconSelector::FindBestMatchingIcon(
-      manifest_.icons, ideal_splash_image_size_in_px,
-      minimum_splash_image_size_in_px,
-      content::Manifest::Icon::IconPurpose::ANY);
-
-  return base::Bind(&ShortcutHelper::FetchSplashScreenImage, contents,
-                    image_url, ideal_splash_image_size_in_px,
-                    minimum_splash_image_size_in_px, webapp_id);
-}
-
 const base::android::ScopedJavaGlobalRef<jobject>&
 AppBannerManagerAndroid::GetJavaBannerManager() const {
   return java_banner_manager_;
 }
 
 bool AppBannerManagerAndroid::IsActiveForTesting(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   return is_active();
 }
@@ skipping 132 matching lines @@
   AppBannerManager::ResetCurrentPageData();
   native_app_data_.Reset();
   native_app_package_ = "";
 }
 
 void AppBannerManagerAndroid::ShowBanner() {
   content::WebContents* contents = web_contents();
   DCHECK(contents);
 
   if (native_app_data_.is_null()) {
+    int ideal_splash_image_size_in_px =
+        ShortcutHelper::GetIdealSplashImageSizeInPx();
+    int minimum_splash_image_size_in_px =
+        ShortcutHelper::GetMinimumSplashImageSizeInPx();

[dominickn, 2017/03/01 02:29:39]

Can you move all of this into CreateShortcutInfo?

+    GURL splash_image_url = ManifestIconSelector::FindBestMatchingIcon(
+        manifest_.icons, ideal_splash_image_size_in_px,
+        minimum_splash_image_size_in_px,
+        content::Manifest::Icon::IconPurpose::ANY);
+
     // TODO(zpeng): Add badge to WebAPK installation flow.
+    std::unique_ptr<ShortcutInfo> shortcut_info = CreateShortcutInfo(
+        manifest_url_, manifest_, primary_icon_url_, splash_image_url,
+        ideal_splash_image_size_in_px, minimum_splash_image_size_in_px);
+
     if (AppBannerInfoBarDelegateAndroid::Create(
-            contents, GetWeakPtr(), app_title_,
-            CreateShortcutInfo(manifest_url_, manifest_, primary_icon_url_),
+            contents, GetWeakPtr(), app_title_, std::move(shortcut_info),
             std::move(primary_icon_), event_request_id(),
             webapk::INSTALL_SOURCE_BANNER)) {
       RecordDidShowBanner("AppBanner.WebApp.Shown");
       TrackDisplayEvent(DISPLAY_EVENT_WEB_APP_BANNER_CREATED);
       ReportStatus(contents, SHOWING_WEB_APP_BANNER);
     } else {
       ReportStatus(contents, FAILED_TO_CREATE_BANNER);
     }
   } else {
     if (AppBannerInfoBarDelegateAndroid::Create(
@@ skipping 110 matching lines @@
 }
 
 // static
 void SetTotalEngagementToTrigger(JNIEnv* env,
                                  const JavaParamRef<jclass>& clazz,
                                  jdouble engagement) {
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(engagement);
 }
 
 }  // namespace banners