chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java - Issue 2760103002: Merge WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME and ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME

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/webapps/WebappLauncherActivity.java

Issue 2760103002: Merge WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME and ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME (Closed)

Patch Set: Merge branch 'master' into package_name 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

« chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.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/webapps/WebappLauncherActivity.java

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

index 64906a676c9cfc65600c40023b17160cce71b088..d6f74bcde7396435f410b9c4333ca0b24ad235da 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java

@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.metrics.LaunchMetrics;

import org.chromium.chrome.browser.tab.Tab;

import org.chromium.chrome.browser.util.IntentUtils;

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

+import org.chromium.webapk.lib.common.WebApkConstants;

import java.lang.ref.WeakReference;

@@ -203,8 +204,8 @@ public class WebappLauncherActivity extends Activity {

private boolean isValidWebApk(Intent intent) {

if (!ChromeWebApkHost.isEnabled()) return false;

- String webApkPackage = IntentUtils.safeGetStringExtra(intent,

- ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME);

+ String webApkPackage =

+ IntentUtils.safeGetStringExtra(intent, WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME);

if (TextUtils.isEmpty(webApkPackage)) return false;

String url = IntentUtils.safeGetStringExtra(intent, ShortcutHelper.EXTRA_URL);