Pass ShortcutHelper.EXTRA_SOURCE when WebAPK is launched from notification

This enables us to keep track of how often WebAPKs are launched from a
notification vs from the home screen.

BUG=623216

Review-Url: https://codereview.chromium.org/2094113002
Cr-Commit-Position: refs/heads/master@{#403307}

chrome/android/java/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java

@@ -21,7 +21,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.common.Referrer;
 import org.chromium.content_public.common.ResourceRequestBody;
 import org.chromium.ui.base.PageTransition;
-import org.chromium.webapk.lib.client.NavigationClient;
+import org.chromium.webapk.lib.client.WebApkNavigationClient;
 import org.chromium.webapk.lib.client.WebApkValidator;
 
 /**
@@ -50,8 +50,13 @@ public class ChromeServiceTabLauncher extends ServiceTabLauncher {
         if (CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_WEBAPK)) {
             String webApkPackageName = WebApkValidator.queryWebApkPackage(context, url);
             if (webApkPackageName != null) {
-                NavigationClient.launchWebApk(context, webApkPackageName, url);
-                return;
+                Intent intent =
+                        WebApkNavigationClient.createLaunchWebApkIntent(webApkPackageName, url);
+                if (intent != null) {
+                    intent.putExtra(ShortcutHelper.EXTRA_SOURCE, ShortcutSource.NOTIFICATION);
+                    context.startActivity(intent);
+                    return;
+                }
             }
         }
 

chrome/android/webapk/libs/client/BUILD.gn

@@ -8,7 +8,7 @@ import("//chrome/android/webapk/libs/runtime_library_version.gni")
 android_library("client_java") {
   java_files = [
     "src/org/chromium/webapk/lib/client/DexOptimizer.java",
-    "src/org/chromium/webapk/lib/client/NavigationClient.java",
+    "src/org/chromium/webapk/lib/client/WebApkNavigationClient.java",
     "src/org/chromium/webapk/lib/client/WebApkServiceConnectionManager.java",
     "src/org/chromium/webapk/lib/client/WebApkValidator.java",
   ]

chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/NavigationClient.java → chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkNavigationClient.java

@@ -4,29 +4,28 @@
 
 package org.chromium.webapk.lib.client;
 
-import android.content.Context;
 import android.content.Intent;
 
 /**
- * NavigationClient provides an API to launch a WebAPK.
+ * WebApkNavigationClient provides an API to get an intent to launch a WebAPK.
  */
-public class NavigationClient {
+public class WebApkNavigationClient {
     /**
-     * Launches a WebAPK.
-     * @param context Application context.
+     * Creates intent to launch a WebAPK.
      * @param webApkPackageName Package name of the WebAPK to launch.
      * @param url URL to navigate WebAPK to.
+     * @return The intent.
      */
-    public static void launchWebApk(Context context, String webApkPackageName, String url) {
+    public static Intent createLaunchWebApkIntent(String webApkPackageName, String url) {
         Intent intent;
         try {
             intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
         } catch (Exception e) {
-            return;
+            return null;
         }
 
         intent.setPackage(webApkPackageName);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
+        return intent;
     }
 }

chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java

@@ -32,6 +32,7 @@ public class MainActivity extends Activity {
     private static final String EXTRA_SHORT_NAME = "org.chromium.chrome.browser.webapp_short_name";
     private static final String EXTRA_NAME = "org.chromium.chrome.browser.webapp_name";
     private static final String EXTRA_URL = "org.chromium.chrome.browser.webapp_url";
+    private static final String EXTRA_SOURCE = "org.chromium.chrome.browser.webapp_source";
     private static final String EXTRA_THEME_COLOR = "org.chromium.chrome.browser.theme_color";
     private static final String EXTRA_BACKGROUND_COLOR =
             "org.chromium.chrome.browser.background_color";
@@ -62,11 +63,13 @@ public class MainActivity extends Activity {
             Bundle bundle = appInfo.metaData;
             String url = bundle.getString(META_DATA_START_URL);
 
-            String overrideUrl = getIntent().getDataString();
+            Intent intent = getIntent();
+            String overrideUrl = intent.getDataString();
             // TODO(pkotwicz): Use same logic as {@code IntentHandler#shouldIgnoreIntent()}
             if (overrideUrl != null && overrideUrl.startsWith("https:")) {
                 url = overrideUrl;
             }
+            int source = intent.getIntExtra(EXTRA_SOURCE, 0);
 
             String webappId = WebApkConstants.WEBAPK_ID_PREFIX + packageName;
             String runtimeHost = bundle.getString(META_DATA_RUNTIME_HOST);
@@ -97,6 +100,7 @@ public class MainActivity extends Activity {
                      .putExtra(EXTRA_NAME, name)
                      .putExtra(EXTRA_URL, url)
                      .putExtra(EXTRA_ICON, encodedIcon)
+                     .putExtra(EXTRA_SOURCE, source)
                      .putExtra(EXTRA_THEME_COLOR, themeColor)
                      .putExtra(EXTRA_BACKGROUND_COLOR, backgroundColor)
                      .putExtra(EXTRA_IS_ICON_GENERATED, isIconGenerated)