chrome/android/java/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java - Issue 2094113002: Pass ShortcutHelper.EXTRA_SOURCE when WebAPK is launched from notification

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

Issue 2094113002: Pass ShortcutHelper.EXTRA_SOURCE when WebAPK is launched from notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge branch 'webapk_more_meta' into webapk_more_meta2 Created 4 years, 6 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 | « no previous file | chrome/android/webapk/libs/client/BUILD.gn » ('j') | chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java

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

index 346487ebcc189db4262b3fb74e3d8cc4711f3960..a0c4556eba6f808903e37f3f4212548533dd5b2f 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java

@@ -21,7 +21,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

import org.chromium.content_public.common.Referrer;

import org.chromium.content_public.common.ResourceRequestBody;

import org.chromium.ui.base.PageTransition;

-import org.chromium.webapk.lib.client.NavigationClient;

+import org.chromium.webapk.lib.client.WebApkNavigationClient;

import org.chromium.webapk.lib.client.WebApkValidator;

/**

@@ -50,8 +50,13 @@ public class ChromeServiceTabLauncher extends ServiceTabLauncher {

if (CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_WEBAPK)) {

String webApkPackageName = WebApkValidator.queryWebApkPackage(context, url);

if (webApkPackageName != null) {

- NavigationClient.launchWebApk(context, webApkPackageName, url);

- return;

+ Intent intent =

+ WebApkNavigationClient.createLaunchWebApkIntent(webApkPackageName, url);

+ if (intent != null) {

+ intent.putExtra(ShortcutHelper.EXTRA_SOURCE, ShortcutSource.NOTIFICATION);

+ context.startActivity(intent);

+ return;

+ }

}