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

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/command_line.h"

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

This command_line.h include can be removed while you're here.

+#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/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"
@@ skipping 99 matching lines @@
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
 
   Java_ShortcutHelper_addShortcut(env, java_id, java_url, java_user_title,
                                   java_bitmap, info.source);
 }
 
 }  // anonymous namespace
 
 // static
 void ShortcutHelper::AddToLauncherWithSkBitmap(
-    content::BrowserContext* browser_context,
+    content::WebContents* web_contents,
     const ShortcutInfo& info,
-    const std::string& webapp_id,
-    const SkBitmap& icon_bitmap,
-    const base::Closure& splash_image_callback) {
+    const SkBitmap& icon_bitmap) {
+  std::string webapp_id = base::GenerateGUID();
   if (info.display == blink::WebDisplayModeStandalone ||
       info.display == blink::WebDisplayModeFullscreen) {
+    base::Closure splash_image_callback =
+        base::Bind(&ShortcutHelper::FetchSplashScreenImage, web_contents,

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

Nit: remove the local and pass the result of base::Bind() as the last argument
in AddWebappWithSkBitmap

+                   info.splash_image_url, info.ideal_splash_image_size_in_px,
+                   info.minimum_splash_image_size_in_px, webapp_id);
+
     AddWebappWithSkBitmap(info, webapp_id, icon_bitmap, splash_image_callback);
     return;
   }
   AddShortcutWithSkBitmap(info, webapp_id, icon_bitmap);
 }
 
 // static
 void ShortcutHelper::InstallWebApkWithSkBitmap(
     content::BrowserContext* browser_context,
     const ShortcutInfo& info,
@@ skipping 203 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);
 }