[Android] Update CCT/Herb menu item

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index fcb1508776806912d5e26d91930107051d24c796..e38183b1faeb975ef3e94c8e00a46a9bb2b27a3f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -1247,8 +1247,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
      * Add the specified tab to bookmarks or allows to edit the bookmark if the specified tab is
      * already bookmarked. If a new bookmark is added, a snackbar will be shown.
      * @param tabToBookmark The tab that needs to be bookmarked.
+     * @param snackbarText Text shown in the snackbar for third-party app. Could be
+     *        <code>null</code> if bookmarking inside Chrome.
      */
-    public void addOrEditBookmark(final Tab tabToBookmark) {
+    public void addOrEditBookmark(final Tab tabToBookmark, final String snackbarText) {
         if (tabToBookmark == null || tabToBookmark.isFrozen()) {
             return;
         }
@@ -1273,9 +1275,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                 if (!tabToBookmark.isClosing() && tabToBookmark.isInitialized()) {
                     // The BookmarkModel will be destroyed by BookmarkUtils#addOrEditBookmark() when
                     // done.
-                    BookmarkId newBookmarkId =
-                            BookmarkUtils.addOrEditBookmark(bookmarkId, bookmarkModel,
-                                    tabToBookmark, getSnackbarManager(), ChromeActivity.this);
+                    BookmarkId newBookmarkId = BookmarkUtils.addOrEditBookmark(bookmarkId,
+                            bookmarkModel, tabToBookmark, getSnackbarManager(), ChromeActivity.this,
+                            snackbarText);

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

actually, I think you can just use isCustomTab() right here to avoid adding a
new param at all (per my later comment)

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

Done.

                     // If a new bookmark was created, try to save an offline page for it.
                     if (newBookmarkId != null && newBookmarkId.getId() != bookmarkId) {
                         OfflinePageUtils.saveBookmarkOffline(newBookmarkId, tabToBookmark);
@@ -1666,7 +1668,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                 RecordUserAction.record("MobileTabClobbered");
             }
         } else if (id == R.id.bookmark_this_page_id) {
-            addOrEditBookmark(currentTab);
+            addOrEditBookmark(currentTab, null);
             RecordUserAction.record("MobileMenuAddToBookmarks");
         } else if (id == R.id.offline_page_id) {
             DownloadUtils.downloadOfflinePage(this, currentTab);