Pass in extra parameters to WebApkBuilder#buildWebApkAsync()

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 "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 44 matching lines @@
   DCHECK(kMinimumHomescreenIconSize <= kIdealHomescreenIconSize);
   DCHECK(kMinimumSplashImageSize <= kIdealSplashImageSize);
 }
 
 } // anonymous namespace
 
 // static
 void ShortcutHelper::AddShortcutInBackgroundWithSkBitmap(
     const ShortcutInfo& info,
     const std::string& webapp_id,
+    const GURL& icon_url,
     const SkBitmap& icon_bitmap,
     const base::Closure& splash_image_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   // Send the data to the Java side to create the shortcut.
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
       base::android::ConvertUTF8ToJavaString(env, webapp_id);
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_user_title =
       base::android::ConvertUTF16ToJavaString(env, info.user_title);
   ScopedJavaLocalRef<jstring> java_name =
       base::android::ConvertUTF16ToJavaString(env, info.name);
   ScopedJavaLocalRef<jstring> java_short_name =
       base::android::ConvertUTF16ToJavaString(env, info.short_name);
+  ScopedJavaLocalRef<jstring> java_icon_url =
+      base::android::ConvertUTF8ToJavaString(env, icon_url.spec());
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
+  ScopedJavaLocalRef<jstring> java_manifest_url =
+      base::android::ConvertUTF8ToJavaString(env, info.manifest_url.spec());
 
   uintptr_t callback_pointer = 0;
   if (info.display == blink::WebDisplayModeStandalone ||
       info.display == blink::WebDisplayModeFullscreen) {
     // The callback will need to be run after shortcut creation completes in
     // order to download the splash image and save it to the WebappDataStorage.
     // Create a copy of the callback here and send the pointer to Java, which
     // will send it back once the asynchronous shortcut creation process
     // finishes.
     callback_pointer =
         reinterpret_cast<uintptr_t>(new base::Closure(splash_image_callback));
   }
 
   Java_ShortcutHelper_addShortcut(
       env,
       java_webapp_id.obj(),
       java_url.obj(),
       java_user_title.obj(),
       java_name.obj(),
       java_short_name.obj(),
+      java_icon_url.obj(),
       java_bitmap.obj(),
       info.display,
       info.orientation,
       info.source,
       info.theme_color,
       info.background_color,
-      info.is_icon_generated,
+      java_manifest_url.obj(),
       callback_pointer);
 }
 
 int ShortcutHelper::GetIdealHomescreenIconSizeInDp() {
   if (kIdealHomescreenIconSize == -1)
     GetHomescreenIconAndSplashImageSizes();
   return kIdealHomescreenIconSize;
 }
 
 int ShortcutHelper::GetMinimumHomescreenIconSizeInDp() {
@@ skipping 99 matching lines @@
   DCHECK(jsplash_image_callback);
   base::Closure* splash_image_callback =
       reinterpret_cast<base::Closure*>(jsplash_image_callback);
   splash_image_callback->Run();
   delete splash_image_callback;
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }