Refactor the INSTALL_SHORTCUT broadcast code into ChromeShortcutManager

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"
@@ skipping 60 matching lines @@
     content::BrowserContext* browser_context,
     const ShortcutInfo& info,
     const std::string& webapp_id,
     const SkBitmap& icon_bitmap,
     const base::Closure& splash_image_callback) {
   if (info.display == blink::WebDisplayModeStandalone ||
       info.display == blink::WebDisplayModeFullscreen) {
     AddWebappWithSkBitmap(info, webapp_id, icon_bitmap, splash_image_callback);
     return;
   }
-  AddShortcutWithSkBitmap(info, icon_bitmap);
+  AddShortcutWithSkBitmap(info, webapp_id, icon_bitmap);
 }
 
 // static
 void ShortcutHelper::InstallWebApkWithSkBitmap(
     content::BrowserContext* browser_context,
     const ShortcutInfo& info,
     const SkBitmap& icon_bitmap,
     const WebApkInstaller::FinishCallback& callback) {
   WebApkInstallService::Get(browser_context)
       ->InstallAsync(info, icon_bitmap, callback);
@@ skipping 34 matching lines @@
       reinterpret_cast<uintptr_t>(new base::Closure(splash_image_callback));
 
   Java_ShortcutHelper_addWebapp(
       env, java_webapp_id, java_url, java_scope_url, java_user_title, java_name,
       java_short_name, java_best_primary_icon_url, java_bitmap, info.display,
       info.orientation, info.source, info.theme_color, info.background_color,
       callback_pointer);
 }
 
 void ShortcutHelper::AddShortcutWithSkBitmap(const ShortcutInfo& info,
+                                             const std::string& id,
                                              const SkBitmap& icon_bitmap) {
   JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jstring> java_id =
+      base::android::ConvertUTF8ToJavaString(env, 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<jobject> java_bitmap;
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
 
-  Java_ShortcutHelper_addShortcut(env, java_url, java_user_title, java_bitmap,
-                                  info.source);
+  Java_ShortcutHelper_addShortcut(env, java_id, java_url, java_user_title,
+                                  java_bitmap, info.source);
 }
 
 void ShortcutHelper::ShowWebApkInstallInProgressToast() {
   Java_ShortcutHelper_showWebApkInstallInProgressToast(
       base::android::AttachCurrentThread());
 }
 
 int ShortcutHelper::GetIdealHomescreenIconSizeInPx() {
   if (g_ideal_homescreen_icon_size == -1)
     GetHomescreenIconAndSplashImageSizes();
@@ skipping 189 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);
 }