Break apart shortcut icon generation

chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java

 // 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.
 
 package org.chromium.chrome.browser;
 
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ skipping 137 matching lines @@
             shortcutIntent = new Intent();
             shortcutIntent.setAction(sFullScreenAction);
             shortcutIntent.putExtra(EXTRA_ICON, encodedIcon);
             shortcutIntent.putExtra(EXTRA_ID, UUID.randomUUID().toString());
             shortcutIntent.putExtra(EXTRA_TITLE, title);
             shortcutIntent.putExtra(EXTRA_URL, url);
             shortcutIntent.putExtra(EXTRA_ORIENTATION, orientation);
             shortcutIntent.putExtra(EXTRA_MAC, getEncodedMac(context, url));
         } else {
             // Add the shortcut as a launcher icon to open in the browser Activity.
-            shortcutIntent = BookmarkUtils.createShortcutIntent(context, url);
+            shortcutIntent = BookmarkUtils.createShortcutIntent(url);
         }
 
         shortcutIntent.setPackage(context.getPackageName());
-        context.sendBroadcast(BookmarkUtils.createAddToHomeIntent(context, shortcutIntent, title,
-                icon, url, red, green, blue));
+        Bitmap launchIcon = BookmarkUtils.createLauncherIcon(context, icon, url, red, green, blue);
+        context.sendBroadcast(BookmarkUtils.createAddToHomeIntent(shortcutIntent, title,
+                launchIcon, url));
 
         // Alert the user about adding the shortcut.
         if (returnToHomescreen) {
             Intent homeIntent = new Intent(Intent.ACTION_MAIN);
             homeIntent.addCategory(Intent.CATEGORY_HOME);
             homeIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(homeIntent);
         } else {
             final String shortUrl = UrlUtilities.getDomainAndRegistry(url, true);
             Handler handler = new Handler(Looper.getMainLooper());
@@ skipping 19 matching lines @@
         // lacks the key for the extra.
         byte[] mac = WebappAuthenticator.getMacForUrl(context, url);
         return Base64.encodeToString(mac, Base64.DEFAULT);
     }
 
     private native long nativeInitialize(WebContents webContents);
     private native void nativeAddShortcut(long nativeShortcutHelper, String userRequestedTitle,
             int launcherLargeIconSize);
     private native void nativeTearDown(long nativeShortcutHelper);
 }