chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java - Issue 1242323003: Remove PrerenderService

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

Issue 1242323003: Remove PrerenderService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/android/java/AndroidManifest.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.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/CustomTabsConnection.java

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

index d17e46d91b8083981d0ae5011b09537bef9c73a2..31415b6e44a626b899bac24702d074a8d786d99e 100644

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

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

@@ -480,9 +480,7 @@ class CustomTabsConnection extends ICustomTabsService.Stub {

private void prerenderUrl(IBinder session, String url, Bundle extras) {

ThreadUtils.assertOnUiThread();

- // TODO(lizeb): Prerendering through ChromePrerenderService is

- // incompatible with prerendering through this service. Remove this

- // limitation, or remove ChromePrerenderService.

WarmupManager.getInstance().disallowPrerendering();

// Ignores mayPrerender() for an empty URL, since it cancels an existing prerender.

if (!mayPrerender() && !TextUtils.isEmpty(url)) return;