chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java - Issue 2123393002: Rename AppLinkHandler to InstantAppsHandler.

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 2123393002: Rename AppLinkHandler to InstantAppsHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Make test inner class static Created 4 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/src/org/chromium/chrome/browser/InstantAppsHandler.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.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 a7d5763f316ea45be01d14a1f75890e39dea9438..411b08ebd0dd0ed68426e9881b84c18c38b90f29 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

@@ -25,10 +25,10 @@ import org.chromium.base.ContextUtils;

import org.chromium.base.Log;

import org.chromium.base.TraceEvent;

import org.chromium.chrome.R;

-import org.chromium.chrome.browser.AppLinkHandler;

import org.chromium.chrome.browser.ChromeApplication;

import org.chromium.chrome.browser.ChromeSwitches;

import org.chromium.chrome.browser.ChromeTabbedActivity;

+import org.chromium.chrome.browser.InstantAppsHandler;

import org.chromium.chrome.browser.IntentHandler;

import org.chromium.chrome.browser.IntentHandler.TabOpenType;

import org.chromium.chrome.browser.UrlConstants;

@@ -180,7 +180,9 @@ public class ChromeLauncherActivity extends Activity

return;

}

- if (AppLinkHandler.getInstance((ChromeApplication) getApplication()).handleIncomingIntent(

+ // Check if we should launch an Instant App to handle the intent.

+ ChromeApplication application = (ChromeApplication) getApplication();

+ if (InstantAppsHandler.getInstance(application).handleIncomingIntent(

this, intent, mIsCustomTabIntent)) {

finish();

return;