[Android] Update CCT/Herb menu item

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
index 9ab1e77fc61714e52a45646f83f26b5de46aa9da..4be6e442547ba5e7f23908465af895f80d51b435 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
@@ -50,11 +50,13 @@ public class BookmarkUtils {
      * @param tab The tab to add or edit a bookmark.
      * @param snackbarManager The SnackbarManager used to show the snackbar.
      * @param activity Current activity.
+     * @param snackbarText Text shown in the snackbar for third-party app. Could be
+     *        <code>null</code> if bookmarking inside Chrome.

[Ted C, 2016/12/28 00:53:47]

You can use the @Nullable annotation on the parameter to let others know it can
be null, but switching to a boolean will avoid that need at all.

[ltian, 2016/12/29 16:31:56]

Done.

      * @return Bookmark ID of the bookmark. Could be <code>null</code> if bookmark didn't exist
      *   and bookmark model failed to create it.
      */
     public static BookmarkId addOrEditBookmark(long existingBookmarkId, BookmarkModel bookmarkModel,
-            Tab tab, SnackbarManager snackbarManager, Activity activity) {
+            Tab tab, SnackbarManager snackbarManager, Activity activity, String snackbarText) {

[Ted C, 2016/12/28 00:53:47]

instead of passing in the text to use, just pass in a boolean whether the
bookmark was done in Chrome.  Then you can have all the string stuff within this
class.

[ltian, 2016/12/29 16:31:56]

Done.

         if (existingBookmarkId != Tab.INVALID_BOOKMARK_ID) {
             BookmarkId bookmarkId = new BookmarkId(existingBookmarkId, BookmarkType.NORMAL);
             startEditActivity(activity, bookmarkId);
@@ -89,8 +91,14 @@ public class BookmarkUtils {
             SnackbarController snackbarController =
                     createSnackbarControllerForEditButton(activity, bookmarkId);
             if (getLastUsedParent(activity) == null) {
-                snackbar = Snackbar.make(activity.getString(R.string.bookmark_page_saved),
-                        snackbarController, Snackbar.TYPE_ACTION, Snackbar.UMA_BOOKMARK_ADDED);
+                if (snackbarText != null) {
+                    snackbar = Snackbar.make(snackbarText, snackbarController, Snackbar.TYPE_ACTION,
+                            Snackbar.UMA_BOOKMARK_ADDED);
+                } else {
+                    snackbar = Snackbar.make(
+                            activity.getString(R.string.bookmark_page_saved_default),
+                            snackbarController, Snackbar.TYPE_ACTION, Snackbar.UMA_BOOKMARK_ADDED);
+                }
             } else {
                 snackbar = Snackbar.make(folderName, snackbarController, Snackbar.TYPE_ACTION,
                         Snackbar.UMA_BOOKMARK_ADDED)