chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.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/WebappInfo.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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.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/WebappInfo.java

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

index 518e9fdcc00b4b7a106b216b54e1bf7755f783f4..1cefa9eda049458fc213bcb0813ceda96a712735 100644

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

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

@@ -15,6 +15,7 @@ import org.chromium.chrome.browser.ShortcutHelper;

import org.chromium.chrome.browser.ShortcutSource;

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

import org.chromium.content_public.common.ScreenOrientationValues;

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

dominickn 2017/03/20 23:59:04 I think you can revert the changes in this file af

/**

* Stores info about a web app.

@@ -303,7 +304,7 @@ public class WebappInfo {

intent.putExtra(ShortcutHelper.EXTRA_BACKGROUND_COLOR, backgroundColor());

intent.putExtra(ShortcutHelper.EXTRA_IS_ICON_GENERATED, isIconGenerated());

if (webApkPackageName() != null) {

- intent.putExtra(ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME, webApkPackageName());

+ intent.putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, webApkPackageName());

}