Split ShortcutHelper#addShortcut() into separate functions for each type of shortcut

chrome/browser/android/shortcut_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_SHORTCUT_HELPER_H_
 #define CHROME_BROWSER_ANDROID_SHORTCUT_HELPER_H_
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "chrome/browser/android/shortcut_info.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace content {
 class WebContents;
 }  // namespace content
 
 // ShortcutHelper is the C++ counterpart of org.chromium.chrome.browser's
 // ShortcutHelper in Java.
 class ShortcutHelper {
  public:
   // Registers JNI hooks.
   static bool RegisterShortcutHelper(JNIEnv* env);
 
-  // Adds a shortcut to the launcher using a SkBitmap. If the shortcut is for
-  // a standalone-capable site, |splash_image_callback| will be invoked once the
-  // Java-side operation has completed. This is necessary as Java will
-  // asynchronously create and populate a WebappDataStorage object for
-  // standalone-capable sites. This must exist before the splash image can be
-  // stored.
+  // Adds a shortcut to the launcher using a SkBitmap.

[dominickn, 2016/07/15 00:19:00]

Nit: "The type of shortcut added depends on the properties in |info|. Calls one
of AddWebApkInBackgroundWithSkBitmap, AddWebappInBackgroundWithSkBitmap, or
AddBookmarkShortcutInBackgroundWithSkBitmap."

Also, rename this method as per the below comment.

   // Must not be called on the UI thread.
   static void AddShortcutInBackgroundWithSkBitmap(
       const ShortcutInfo& info,
       const std::string& webapp_id,
       const SkBitmap& icon_bitmap,
       const base::Closure& splash_image_callback);
 
+  // Installs WebAPK and adds shortcut to the launcher.
+  // Must not be called on the UI thread.
+  static void AddWebApkInBackgroundWithSkBitmap(

[dominickn, 2016/07/15 00:19:00]

Perhaps InstallWebApkInBackgroundWithSkBitmap for consistency with the Java
side?

+      const ShortcutInfo& info,
+      const std::string& webapp_id,
+      const SkBitmap& icon_bitmap);
+
+  // Adds a shortcut which opens in a fullscreen window to the launcher.
+  // |splash_image_callback| will be invoked once the Java-side operation has
+  // completed. This is necessary as Java will asynchronously create and
+  // populate a WebappDataStorage object for standalone-capable sites. This must
+  // exist before the splash image can be stored.
+  // Must not be called on the UI thread.
+  static void AddWebappInBackgroundWithSkBitmap(
+      const ShortcutInfo& info,
+      const std::string& webapp_id,
+      const SkBitmap& icon_bitmap,
+      const base::Closure& splash_image_callback);
+
+  // Adds a shortcut which opens in a browser tab to the launcher.
+  // Must not be called on the UI thread.
+  static void AddBookmarkShortcutInBackgroundWithSkBitmap(

[dominickn, 2016/07/15 00:19:00]

"Bookmark shortcut" is a bit misleading here because these are not equivalent to
bookmarks and don't add a Chrome bookmark. How about
"AddShortcutInBackgroundWithSkBitmap" instead, and the method above with that
name can be "AddToLauncherInBackgroundWithSkBitmap?

+      const ShortcutInfo& info,
+      const SkBitmap& icon_bitmap);
+
   // Returns the ideal size for an icon representing a web app.
   static int GetIdealHomescreenIconSizeInDp();
 
   // Returns the minimum size for an icon representing a web app.
   static int GetMinimumHomescreenIconSizeInDp();
 
   // Returns the ideal size for an image displayed on a web app's splash
   // screen.
   static int GetIdealSplashImageSizeInDp();
 
@@ skipping 28 matching lines @@
   static bool IsWebApkInstalled(const GURL& url);
 
  private:
   ShortcutHelper() = delete;
   ~ShortcutHelper() = delete;
 
   DISALLOW_COPY_AND_ASSIGN(ShortcutHelper);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_SHORTCUT_HELPER_H_