Upstream: Launch WebApkActivity from WebAPK.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.util.Log;
@@ skipping 14 matching lines @@
     private Bitmap mDecodedIcon;
     private Uri mUri;
     private String mName;
     private String mShortName;
     private int mDisplayMode;
     private int mOrientation;
     private int mSource;
     private long mThemeColor;
     private long mBackgroundColor;
     private boolean mIsIconGenerated;
+    private String mWebApkPackageName;
 
     public static WebappInfo createEmpty() {
         return new WebappInfo();
     }
 
     private static String titleFromIntent(Intent intent) {
         // The reference to title has been kept for reasons of backward compatibility. For intents
         // and shortcuts which were created before we utilized the concept of name and shortName,
         // we set the name and shortName to be the title.
         String title = IntentUtils.safeGetStringExtra(intent, ShortcutHelper.EXTRA_TITLE);
@@ skipping 28 matching lines @@
                 ShortcutHelper.EXTRA_THEME_COLOR,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING);
         long backgroundColor = IntentUtils.safeGetLongExtra(intent,
                 ShortcutHelper.EXTRA_BACKGROUND_COLOR,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING);
         boolean isIconGenerated = IntentUtils.safeGetBooleanExtra(intent,
                 ShortcutHelper.EXTRA_IS_ICON_GENERATED, false);
 
         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);
     }
 
     /**
      * Construct a WebappInfo.
      * @param id              ID for the webapp.
      * @param url             URL for the webapp.
      * @param icon            Icon to show for the webapp.
      * @param name            Name of the webapp.
      * @param shortName       The short name of the webapp.
      * @param displayMode     Display mode of the webapp.
      * @param orientation     Orientation of the webapp.
      * @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;
         }
 
         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;
         mShortName = shortName;
         mUri = uri;
         mDisplayMode = displayMode;
         mOrientation = orientation;
-        mSource = source;
         mThemeColor = themeColor;
         mBackgroundColor = backgroundColor;
         mIsIconGenerated = isIconGenerated;
         mIsInitialized = mUri != null;
+        mWebApkPackageName = webApkPackageName;
     }
 
     private WebappInfo() {
     }
 
     public boolean isInitialized() {
         return mIsInitialized;
     }
 
     public String id() {
         return mId;
     }
 
     public Uri uri() {
         return mUri;
     }
 
     public String name() {
         return mName;
     }
 
     public String shortName() {
         return mShortName;
     }
 
     public int displayMode() {
         return mDisplayMode;
     }
 
+    public String webApkPackageName() {
+        return mWebApkPackageName;
+    }
+
     public int orientation() {
         return mOrientation;
     }
 
     public int source() {
         return mSource;
     }
 
     /**
      * Theme color is actually a 32 bit unsigned integer which encodes a color
@@ skipping 59 matching lines @@
         return mIsIconGenerated;
     }
 
     /**
      * Sets extras on an Intent that will launch a WebappActivity.
      * @param intent Intent that will be used to launch a WebappActivity.
      */
     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());
         intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName());
         intent.putExtra(ShortcutHelper.EXTRA_DISPLAY_MODE, displayMode());
         intent.putExtra(ShortcutHelper.EXTRA_ORIENTATION, orientation());
         intent.putExtra(ShortcutHelper.EXTRA_SOURCE, source());
         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());
+        }
     }
 
     /**
      * Returns true if the WebappInfo was created for an Intent fired from a launcher shortcut (as
      * opposed to an intent from a push notification or other internal source).
      */
     public boolean isLaunchedFromHomescreen() {
         return source() != ShortcutSource.NOTIFICATION;
     }
 }