chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java - Issue 1956403002: Re-submit of AppLink implementation.

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 1956403002: Re-submit of AppLink implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Lock it and throw away the key 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/ChromeSwitches.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegate.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 e5c105e094be9c2b071941adc130f05514cec702..85135d9789ff80e420f2199b76a1dc149b9fc810 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

@@ -35,6 +35,7 @@ import org.chromium.base.CommandLineInitUtil;

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;

@@ -210,6 +211,12 @@ public class ChromeLauncherActivity extends Activity

return;

}

+ if (AppLinkHandler.getInstance((ChromeApplication) getApplication()).handleIntent(

+ this, intent, mIsCustomTabIntent)) {

+ finish();

+ return;

+ }

// Check if we should launch the ChromeTabbedActivity.

if (!mIsCustomTabIntent && !FeatureUtilities.isDocumentMode(this)) {

launchTabbedMode();