[Download Home] Various M55 adjustments

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.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.customtabs;
 
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.app.PendingIntent.CanceledException;
 import android.content.Context;
@@ skipping 326 matching lines @@
 
     /**
      * Triggers the client-defined action when the user clicks a custom menu item.
      * @param menuIndex The index that the menu item is shown in the result of
      *                  {@link #getMenuTitles()}
      */
     public void clickMenuItemWithUrl(ChromeActivity activity, int menuIndex, String url) {
         Intent addedIntent = new Intent();
         addedIntent.setData(Uri.parse(url));
         try {
+            // Media viewers pass in PendingIntents that contain CHOOSER Intents.  Setting the data
+            // in these cases prevents the Intent from firing correctly.
             PendingIntent pendingIntent = mMenuEntries.get(menuIndex).second;
-            pendingIntent.send(activity, 0, addedIntent, mOnFinished, null);
+            pendingIntent.send(
+                    activity, 0, isMediaViewer() ? null : addedIntent, mOnFinished, null);
         } catch (CanceledException e) {
             Log.e(TAG, "Custom tab in Chrome failed to send pending intent.");
         }
     }
 
     /**
      * @return Whether chrome should animate when it finishes. We show animations only if the client
      *         app has supplied the correct animation resources via intent extra.
      */
     public boolean shouldAnimateOnFinish() {
@@ skipping 83 matching lines @@
         if (TextUtils.isEmpty(herbFlavor)
                 || TextUtils.equals(ChromeSwitches.HERB_FLAVOR_DISABLED, herbFlavor)) {
             return;
         }
         if (!IntentHandler.isIntentChromeOrFirstParty(intent, context)) return;
 
         mIsOpenedByChrome = IntentUtils.safeGetBooleanExtra(
                 intent, EXTRA_IS_OPENED_BY_CHROME, false);
     }
 }