chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java - Issue 1954363002: Start using the third_party/custom_tabs_client as support lib source

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/customtabs/CustomTabIntentDataProvider.java

Issue 1954363002: Start using the third_party/custom_tabs_client as support lib source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Nits Created 4 years, 7 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabContentHandler.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.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/customtabs/CustomTabIntentDataProvider.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

index a581cf0fb2fe03de52fe71b359fee999eed237cd..6c6ebf29c5d3b96609090217be867a54457ada57 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

@@ -16,8 +16,8 @@ import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

-import android.os.IBinder;

import android.support.customtabs.CustomTabsIntent;

+import android.support.customtabs.CustomTabsSessionToken;

import android.text.TextUtils;

import android.util.Pair;

import android.view.View;

@@ -70,7 +70,7 @@ public class CustomTabIntentDataProvider {

ANIMATION_BUNDLE_PREFIX + "animEnterRes";

private static final String BUNDLE_EXIT_ANIMATION_RESOURCE =

ANIMATION_BUNDLE_PREFIX + "animExitRes";

- private final IBinder mSession;

+ private final CustomTabsSessionToken mSession;

private final Intent mKeepAliveServiceIntent;

private final int mTitleVisibilityState;

private int mToolbarColor;

@@ -100,7 +100,7 @@ public class CustomTabIntentDataProvider {

public CustomTabIntentDataProvider(Intent intent, Context context) {

if (intent == null) assert false;

- mSession = IntentUtils.safeGetBinderExtra(intent, CustomTabsIntent.EXTRA_SESSION);

+ mSession = CustomTabsSessionToken.getSessionTokenFromIntent(intent);

parseHerbExtras(intent, context);

retrieveCustomButtons(intent, context);

@@ -202,7 +202,7 @@ public class CustomTabIntentDataProvider {

/**

* @return The session specified in the intent, or null.

- public IBinder getSession() {

+ public CustomTabsSessionToken getSession() {

return mSession;

}