[Android] Update CCT/Herb menu item

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

 // Copyright 2015 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.download;
 
 import android.app.Activity;
 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;
 
 /**
  * Class for displaying a snackbar when a download completes.
  */
 public class DownloadSnackbarController implements SnackbarManager.SnackbarController {
     public static final int INVALID_NOTIFICATION_ID = -1;
     private static final int SNACKBAR_DURATION_IN_MILLISECONDS = 5000;
@@ skipping 44 matching lines @@
      * Called to display the download succeeded snackbar.
      *
      * @param downloadInfo Info of the download.
      * @param notificationId Notification Id of the successful download.
      * @param downloadId Id of the download from Android DownloadManager.
      * @param canBeResolved Whether the download can be resolved to any activity.
      */
     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;
         if (canBeResolved || downloadInfo.isOfflinePage()) {
             info = new ActionDataInfo(downloadInfo, notificationId, downloadId);
         }
         // Show downloads app if the download cannot be resolved to any activity.
         snackbar.setAction(
                 mContext.getString(R.string.open_downloaded_label), info);
         getSnackbarManager().showSnackbar(snackbar);
@@ skipping 14 matching lines @@
                 .setSingleLine(false)
                 .setDuration(SNACKBAR_DURATION_IN_MILLISECONDS);
         if (showAllDownloads) {
             snackbar.setAction(
                     mContext.getString(R.string.open_downloaded_label),
                     null);
         }
         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();
         }
         return null;
     }
 }