[Offline Pages] Fix several infobar bugs.

chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java
index 08fa74b27bbeb718cad669f64751e17166638619..51958cd8f402c8e2846c3df87d629fe03915076f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java
@@ -19,6 +19,7 @@ import android.view.View;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.download.DownloadUtils;
 
 import java.util.List;
 
@@ -41,7 +42,8 @@ public class DownloadOverwriteInfoBar extends InfoBar {
      * Constructs DownloadOverwriteInfoBar.
      * @param fileName The file name. ex) example.jpg
      * @param dirName The dir name. ex) Downloads
-     * @param dirFullPath The full dir path. ex) sdcards/Downloads
+     * @param dirFullPath The full dir path. ex) sdcards/Downloads.  If empty, the Download Manager
+     *     will be opened.

[gone, 2016/10/11 20:01:18]

indent this under "The"

[dewittj, 2016/10/11 21:24:52]

Done.

      */
     private DownloadOverwriteInfoBar(String fileName, String dirName, String dirFullPath) {
         super(R.drawable.infobar_downloading, null, null);
@@ -57,9 +59,18 @@ public class DownloadOverwriteInfoBar extends InfoBar {
         onButtonClicked(action);
     }
 
+    private boolean opensDownloadManager() {
+        return mDirFullPath == null || mDirFullPath.isEmpty();
+    }
+
     private CharSequence getMessageText(Context context) {
         String template = context.getString(R.string.download_overwrite_infobar_text);
-        Intent intent = getIntentForDirectoryLaunch(mDirFullPath);
+        Intent intent = null;
+
+        // If the full path is left empty, we assume that the file is in the Chrome Download
+        // Manager.  So then in formatInfoBarMessage, if the intent remains null then we are going
+        // to open the download manager when the directory name is clicked.
+        if (!opensDownloadManager()) intent = getIntentForDirectoryLaunch(mDirFullPath);

[fgorski, 2016/10/10 21:30:46]

You may need {}. I think someone mentioned to me in review in the past that
one-oliners on java side are reserved for return statements only. Leaving this
comment for reviewer to check.

[gone, 2016/10/11 20:01:18]

This should be fine; we've done it in the past to set variables that are null,
for example.

         return formatInfoBarMessage(context, template, mFileName, mDirName, intent);
     }
 
@@ -97,7 +108,7 @@ public class DownloadOverwriteInfoBar extends InfoBar {
      * @param dirNameIntent The intent to be launched when user touches the directory name link.
      * @return CharSequence formatted message for InfoBar.
      */
-    private static CharSequence formatInfoBarMessage(final Context context, String template,
+    private CharSequence formatInfoBarMessage(final Context context, String template,
             String fileName, String dirName, final Intent dirNameIntent) {
         SpannableString formattedFileName = new SpannableString(fileName);
         formattedFileName.setSpan(new StyleSpan(Typeface.BOLD), 0, fileName.length(),
@@ -111,6 +122,13 @@ public class DownloadOverwriteInfoBar extends InfoBar {
                     context.startActivity(dirNameIntent);
                 }
             }, 0, dirName.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        } else if (opensDownloadManager()) {
+            formattedDirName.setSpan(new ClickableSpan() {
+                @Override
+                public void onClick(View view) {
+                    DownloadUtils.showDownloadManager(null, null);
+                }
+            }, 0, dirName.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
 
         return TextUtils.expandTemplate(template, formattedFileName, formattedDirName);