Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java |
| index e0cecabdf9d3e1c6341b73324c8e9eb4ca22c9bb..729e1a5be6ffcbee556bff1ceb90c7af4ecaa8f2 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java |
| @@ -28,6 +28,7 @@ import android.text.TextUtils; |
| import android.util.Base64; |
| import org.chromium.base.ApiCompatibilityUtils; |
| +import org.chromium.base.CommandLine; |
| import org.chromium.base.ContextUtils; |
| import org.chromium.base.Log; |
| import org.chromium.base.ThreadUtils; |
| @@ -35,12 +36,14 @@ import org.chromium.base.VisibleForTesting; |
| import org.chromium.base.annotations.CalledByNative; |
| import org.chromium.blink_public.platform.WebDisplayMode; |
| import org.chromium.chrome.R; |
| +import org.chromium.chrome.browser.webapps.WebApkBuilder; |
| import org.chromium.chrome.browser.webapps.WebappAuthenticator; |
| import org.chromium.chrome.browser.webapps.WebappDataStorage; |
| import org.chromium.chrome.browser.webapps.WebappLauncherActivity; |
| import org.chromium.chrome.browser.webapps.WebappRegistry; |
| import org.chromium.chrome.browser.widget.RoundedIconGenerator; |
| import org.chromium.content_public.common.ScreenOrientationConstants; |
| +import org.chromium.net.GURLUtils; |
| import org.chromium.ui.widget.Toast; |
| import java.io.ByteArrayOutputStream; |
| @@ -148,6 +151,13 @@ public class ShortcutHelper { |
| boolean isWebappCapable = (displayMode == WebDisplayMode.Standalone |
| || displayMode == WebDisplayMode.Fullscreen); |
| if (isWebappCapable) { |
| + if (CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_WEBAPK)) { |
| + WebApkBuilder apkBuilder = ((ChromeApplication) context).createWebApkBuilder(); |
| + if (apkBuilder != null) { |
| + apkBuilder.buildWebApkAsync(url, GURLUtils.getOrigin(url), shortName, icon); |
|
Xi Han
2016/06/06 21:20:18
We could do the encoding for the "icon" here, and
pkotwicz
2016/06/06 21:29:24
We could. I think that the fact that buildWebApkAs
Xi Han
2016/06/07 13:20:37
You are right, we should keep the Bitmap.
|
| + return; |
| + } |
| + } |
| shortcutIntent = createWebappShortcutIntent(id, sDelegate.getFullscreenAction(), url, |
| getScopeFromUrl(url), name, shortName, icon, WEBAPP_SHORTCUT_VERSION, |
| displayMode, orientation, themeColor, backgroundColor, isIconGenerated); |