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 a0ae0609acec202b5623ebc62e0f88fc10c38d2d..dfd5d02bc0a8eafc61d883ad52c311e0de68a97d 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 |
@@ -32,6 +32,7 @@ public class WebappInfo { |
private long mThemeColor; |
private long mBackgroundColor; |
private boolean mIsIconGenerated; |
+ private String mWebApkPackageName; |
public static WebappInfo createEmpty() { |
return new WebappInfo(); |
@@ -80,9 +81,11 @@ public class WebappInfo { |
String name = nameFromIntent(intent); |
String shortName = shortNameFromIntent(intent); |
+ String webApkPackageName = IntentUtils.safeGetStringExtra(intent, |
+ ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME); |
return create(id, url, icon, name, shortName, displayMode, orientation, source, |
- themeColor, backgroundColor, isIconGenerated); |
+ themeColor, backgroundColor, isIconGenerated, webApkPackageName); |
} |
/** |
@@ -97,10 +100,12 @@ public class WebappInfo { |
* @param source Source where the webapp was added from. |
* @param themeColor The theme color of the webapp. |
* @param isIconGenerated Whether the |icon| was generated by Chromium. |
+ * @param webApkPackageName The package of the WebAPK associated with the webapp. Null if |
+ * no WebAPK is associated with the webapp. |
*/ |
public static WebappInfo create(String id, String url, String icon, String name, |
String shortName, int displayMode, int orientation, int source, long themeColor, |
- long backgroundColor, boolean isIconGenerated) { |
+ long backgroundColor, boolean isIconGenerated, String webApkPackageName) { |
if (id == null || url == null) { |
Log.e("WebappInfo", "Data passed in was incomplete: " + id + ", " + url); |
return null; |
@@ -108,12 +113,12 @@ public class WebappInfo { |
Uri uri = Uri.parse(url); |
return new WebappInfo(id, uri, icon, name, shortName, displayMode, orientation, source, |
- themeColor, backgroundColor, isIconGenerated); |
+ themeColor, backgroundColor, isIconGenerated, webApkPackageName); |
} |
private WebappInfo(String id, Uri uri, String encodedIcon, String name, String shortName, |
int displayMode, int orientation, int source, long themeColor, |
- long backgroundColor, boolean isIconGenerated) { |
+ long backgroundColor, boolean isIconGenerated, String webApkPackageName) { |
mEncodedIcon = encodedIcon; |
mId = id; |
mName = name; |
@@ -121,11 +126,11 @@ public class WebappInfo { |
mUri = uri; |
mDisplayMode = displayMode; |
mOrientation = orientation; |
- mSource = source; |
mThemeColor = themeColor; |
mBackgroundColor = backgroundColor; |
mIsIconGenerated = isIconGenerated; |
mIsInitialized = mUri != null; |
+ mWebApkPackageName = webApkPackageName; |
} |
private WebappInfo() { |
@@ -155,6 +160,10 @@ public class WebappInfo { |
return mDisplayMode; |
} |
+ public String webApkPackageName() { |
+ return mWebApkPackageName; |
+ } |
+ |
public int orientation() { |
return mOrientation; |
} |
@@ -234,8 +243,6 @@ public class WebappInfo { |
public void setWebappIntentExtras(Intent intent) { |
intent.putExtra(ShortcutHelper.EXTRA_ID, id()); |
intent.putExtra(ShortcutHelper.EXTRA_URL, uri().toString()); |
- intent.putExtra(ShortcutHelper.EXTRA_SCOPE, |
- ShortcutHelper.getScopeFromUrl(uri().toString())); |
intent.putExtra(ShortcutHelper.EXTRA_ICON, encodedIcon()); |
intent.putExtra(ShortcutHelper.EXTRA_VERSION, ShortcutHelper.WEBAPP_SHORTCUT_VERSION); |
intent.putExtra(ShortcutHelper.EXTRA_NAME, name()); |
@@ -246,6 +253,9 @@ public class WebappInfo { |
intent.putExtra(ShortcutHelper.EXTRA_THEME_COLOR, themeColor()); |
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()); |
+ } |
} |
/** |