[Android] Update CCT/Herb menu item

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java

Index: chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java
index 206998b8a2b0d310da95f8453b1f92c2d07069a1..03a8b24ea86eaabf26ffdf6b5376371848f46c11 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java
@@ -9,7 +9,9 @@ import android.app.NotificationManager;
 import android.content.Context;
 
 import org.chromium.base.ApplicationStatus;
+import org.chromium.base.BuildInfo;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 import org.chromium.chrome.browser.offlinepages.downloads.OfflinePageDownloadBridge;
 import org.chromium.chrome.browser.snackbar.Snackbar;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
@@ -74,9 +76,17 @@ public class DownloadSnackbarController implements SnackbarManager.SnackbarContr
     public void onDownloadSucceeded(
             DownloadInfo downloadInfo, int notificationId, long downloadId, boolean canBeResolved) {
         if (getSnackbarManager() == null) return;
-        Snackbar snackbar = Snackbar.make(
-                mContext.getString(R.string.download_succeeded_message, downloadInfo.getFileName()),
-                this, Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_DOWNLOAD_SUCCEEDED);
+        Snackbar snackbar;
+        if (getLastTrackedFocusedActivity() instanceof CustomTabActivity) {
+            String packageLabel = BuildInfo.getPackageLabel(getLastTrackedFocusedActivity());
+            snackbar = Snackbar.make(mContext.getString(R.string.download_succeeded_message,
+                                             downloadInfo.getFileName(), packageLabel),
+                    this, Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_DOWNLOAD_SUCCEEDED);
+        } else {
+            snackbar = Snackbar.make(mContext.getString(R.string.download_succeeded_message_default,
+                                             downloadInfo.getFileName()),
+                    this, Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_DOWNLOAD_SUCCEEDED);
+        }
         // TODO(qinmin): Coalesce snackbars if multiple downloads finish at the same time.
         snackbar.setDuration(SNACKBAR_DURATION_IN_MILLISECONDS).setSingleLine(false);
         ActionDataInfo info = null;
@@ -111,8 +121,12 @@ public class DownloadSnackbarController implements SnackbarManager.SnackbarContr
         getSnackbarManager().showSnackbar(snackbar);
     }
 
+    public Activity getLastTrackedFocusedActivity() {

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

I would just call this getActivity() and I think it should be private.

And I would put in the check ApplicationStatus.hasVisibleActivities() here.  If
that is false, return null.

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

Done.

+        return ApplicationStatus.getLastTrackedFocusedActivity();
+    }
+
     public SnackbarManager getSnackbarManager() {
-        Activity activity = ApplicationStatus.getLastTrackedFocusedActivity();
+        Activity activity = getLastTrackedFocusedActivity();
         if (activity != null && ApplicationStatus.hasVisibleActivities()
                 && activity instanceof SnackbarManager.SnackbarManageable) {
             return ((SnackbarManager.SnackbarManageable) activity).getSnackbarManager();