Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java |
index c011fcd41d7eb8ffad494f1c07aa9e2ed96b0fb2..aaa809f8b205eb1488f5027003f3ca23d24bdc62 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java |
@@ -10,9 +10,13 @@ import android.content.Intent; |
import android.net.Uri; |
import android.os.Bundle; |
import android.provider.Browser; |
+import android.support.customtabs.CustomTabsIntent; |
import org.chromium.base.ApiCompatibilityUtils; |
+import org.chromium.base.ApplicationStatus; |
import org.chromium.base.ContextUtils; |
+import org.chromium.chrome.R; |
+import org.chromium.chrome.browser.ChromeActivity; |
import org.chromium.chrome.browser.IntentHandler; |
import org.chromium.chrome.browser.ServiceTabLauncher; |
import org.chromium.chrome.browser.TabState; |
@@ -94,6 +98,34 @@ public class TabDelegate extends TabCreator { |
activity.startActivity(intent); |
} |
+ /** |
+ * Creates a popup custom tab to open the url. The popup tab is animated in from bottom to top |
+ * and out from top to bottom. |
please use gerrit instead
2017/06/02 03:43:16
Add a comment that this is used by PaymentRequestE
gogerald1
2017/06/02 13:21:39
Done.
|
+ * |
+ * @param requestId The tab launch request ID from the {@link ServiceTabLauncher}. |
+ * @param url The url to open in the new tab. |
+ */ |
+ public boolean createPopupCustomTab(int requestId, String url) { |
+ // Do not open the popup custom tab if the chrome activity is not in the forground. |
+ Activity lastTrackedActivity = ApplicationStatus.getLastTrackedFocusedActivity(); |
+ if (!(lastTrackedActivity instanceof ChromeActivity)) return false; |
+ |
+ CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(); |
+ builder.setShowTitle(true); |
+ builder.setStartAnimations(lastTrackedActivity, R.anim.slide_in_up, 0); |
+ builder.setExitAnimations(lastTrackedActivity, 0, R.anim.slide_out_down); |
+ CustomTabsIntent customTabsIntent = builder.build(); |
+ customTabsIntent.intent.setPackage(ContextUtils.getApplicationContext().getPackageName()); |
+ customTabsIntent.intent.putExtra(ServiceTabLauncher.LAUNCH_REQUEST_ID_EXTRA, requestId); |
+ customTabsIntent.intent.putExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, mIsIncognito); |
+ customTabsIntent.intent.putExtra(Browser.EXTRA_APPLICATION_ID, |
+ ContextUtils.getApplicationContext().getPackageName()); |
+ |
+ customTabsIntent.launchUrl(lastTrackedActivity, Uri.parse(url)); |
+ |
+ return true; |
+ } |
+ |
@Override |
public Tab launchUrl(String url, TabLaunchType type) { |
return createNewTab(new LoadUrlParams(url), type, null); |