chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java - Issue 1234643002: customtabs: Convert to the new AIDL interface, temporarily imported.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

Issue 1234643002: customtabs: Convert to the new AIDL interface, temporarily imported. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added VisibleForTesting to util only used for testing Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/android/java/src/android/support/customtabs/CustomTabsIntent.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/customtabs/common.aidl ('k') | chrome/android/java/src/org/chromium/chrome/browser/util/IntentUtils.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

index 96e1193c0848435865e65f031e7e2b6c35374064..11b54e0cebe7dc4ebbd6cf48c9a009e33fd8c9c0 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

@@ -21,6 +21,7 @@ import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.provider.Browser;

+import android.support.customtabs.CustomTabsIntent;

import android.text.TextUtils;

import android.util.Base64;

import android.util.Log;

@@ -38,7 +39,6 @@ import org.chromium.chrome.browser.UrlConstants;

import org.chromium.chrome.browser.WarmupManager;

import org.chromium.chrome.browser.WebappAuthenticator;

import org.chromium.chrome.browser.customtabs.CustomTabActivity;

-import org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider;

import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;

import org.chromium.chrome.browser.metrics.LaunchHistogram;

import org.chromium.chrome.browser.metrics.LaunchMetrics;

@@ -259,10 +259,7 @@ public class ChromeLauncherActivity extends Activity

* @return True if the intent is handled here.

private boolean handleCustomTabActivityIntent() {

- if (getIntent() == null) return false;

- if (!getIntent().hasExtra(

- CustomTabIntentDataProvider.EXTRA_CUSTOM_TABS_SESSION_ID)) {

+ if (getIntent() == null || !getIntent().hasExtra(CustomTabsIntent.EXTRA_SESSION)) {

return false;

}