chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java - Issue 2748013004: CustomTabs: Base version for prerender switch

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/CustomTabActivity.java

Issue 2748013004: CustomTabs: Base version for prerender switch (Closed)

Patch Set: Some more misc fixes Created 3 years, 9 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/ClientManager.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

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

index 5109a5032d05af296e97f7406ff083a64160800d..f6fdeca2da7a988fa3f537b12d1a3f43eec5a766 100644

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

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

@@ -396,7 +396,7 @@ public class CustomTabActivity extends ChromeActivity {

// If extra headers have been passed, cancel any current prerender, as

Benoit L 2017/03/27 15:10:58 Note that this applies to prerender only, per the

// prerendering doesn't support extra headers.

if (IntentHandler.getExtraHeadersFromIntent(getIntent()) != null) {

- connection.cancelPrerender(mSession);

+ connection.cancelSpeculation(mSession);

}

getTabModelSelector().getModel(false).addObserver(mTabModelObserver);