Upstream: Launch WebAPK without showing intent picker when user taps link in WebAPK scope

chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationParams.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.externalnav;
 
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabRedirectHandler;
 
 /**
@@ skipping 25 matching lines @@
 
     /** Whether the intent should force a new tab to open. */
     private final boolean mOpenInNewTab;
 
     /** Whether this navigation happens in background tab. */
     private final boolean mIsBackgroundTabNavigation;
 
     /** Whether this navigation happens in main frame. */
     private final boolean mIsMainFrame;
 
-    /** Whether this navigation happens in a WebAPK. */
-    private final boolean mIsWebApk;
+    /**
+     * The package name of the WebAPK that the navigation happens in. Null if the navigation is not
+     * happening in a WebAPK.
+     */
+    private final String mWebApkPackageName;
 
     /** Whether this navigation is launched by user gesture. */
     private final boolean mHasUserGesture;
 
     /**
      * Whether the current tab should be closed when an URL load was overridden and an
      * intent launched.
      */
     private final boolean mShouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent;
 
     private ExternalNavigationParams(String url, boolean isIncognito, String referrerUrl,
             int pageTransition, boolean isRedirect, boolean appMustBeInForeground,
             TabRedirectHandler redirectHandler, Tab tab, boolean openInNewTab,
-            boolean isBackgroundTabNavigation, boolean isMainFrame, boolean isWebApk,
+            boolean isBackgroundTabNavigation, boolean isMainFrame, String webApkPackageName,
             boolean hasUserGesture,
             boolean shouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent) {
         mUrl = url;
         mIsIncognito = isIncognito;
         mPageTransition = pageTransition;
         mReferrerUrl = referrerUrl;
         mIsRedirect = isRedirect;
         mApplicationMustBeInForeground = appMustBeInForeground;
         mRedirectHandler = redirectHandler;
         mTab = tab;
         mOpenInNewTab = openInNewTab;
         mIsBackgroundTabNavigation = isBackgroundTabNavigation;
         mIsMainFrame = isMainFrame;
-        mIsWebApk = isWebApk;
+        mWebApkPackageName = webApkPackageName;
         mHasUserGesture = hasUserGesture;
         mShouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent =
                 shouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent;
     }
 
     /** @return The URL to potentially open externally. */
     public String getUrl() {
         return mUrl;
     }
 
@@ skipping 43 matching lines @@
     /** @return Whether this navigation happens in background tab. */
     public boolean isBackgroundTabNavigation() {
         return mIsBackgroundTabNavigation;
     }
 
     /** @return Whether this navigation happens in main frame. */
     public boolean isMainFrame() {
         return mIsMainFrame;
     }
 
-    /** @return Whether this navigation happens in a WebAPK. */
-    public boolean isWebApk() {
-        return mIsWebApk;
+    /**
+     * @return Package name of the WebAPK that the navigation happens in. Null if the navigation is
+     * not happening in a WebAPK.

[Xi Han, 2016/06/07 19:16:47]

Please align "not happening" with "Package name".

+     */
+    public String webApkPackageName() {
+        return mWebApkPackageName;
     }
 
     /** @return Whether this navigation is launched by user gesture. */
     public boolean hasUserGesture() {
         return mHasUserGesture;
     }
 
     /**
      * @return Whether the current tab should be closed when an URL load was overridden and an
      *         intent launched.
@@ skipping 29 matching lines @@
 
         /** Whether the intent should force a new tab to open. */
         private boolean mOpenInNewTab;
 
         /** Whether this navigation happens in background tab. */
         private boolean mIsBackgroundTabNavigation;
 
         /** Whether this navigation happens in main frame. */
         private boolean mIsMainFrame;
 
-        /** Whether this navigation happens in a WebAPK. */
-        private boolean mIsWebApk;
+        /**
+         * The package name of the WebAPK that the navigation happens in. Null if the navigation is
+         * not happening in a WebAPK.
+         */
+        private String mWebApkPackageName;
 
         /** Whether this navigation is launched by user gesture. */
         private boolean mHasUserGesture;
 
         /**
          * Whether the current tab should be closed when an URL load was overridden and an
          * intent launched.
          */
         private boolean mShouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent;
 
@@ skipping 40 matching lines @@
             mIsBackgroundTabNavigation = v;
             return this;
         }
 
         /** Sets whether this navigation happens in main frame. */
         public Builder setIsMainFrame(boolean v) {
             mIsMainFrame = v;
             return this;
         }
 
-        /** Sets whether this navigation happens in a WebAPK. */
-        public Builder setIsWebApk(boolean v) {
-            mIsWebApk = v;
+        /**
+         * Sets the package name of the WebAPK that the navigation happens in. Null if the
+         * navigation is not happening in a WebAPK.
+         */
+        public Builder setWebApkPackageName(String v) {
+            mWebApkPackageName = v;
             return this;
         }
 
         /** Sets whether this navigation happens in main frame. */
         public Builder setHasUserGesture(boolean v) {
             mHasUserGesture = v;
             return this;
         }
 
         /** Sets whether the current tab should be closed when an URL load was overridden and an
          * intent launched.
          */
         public Builder setShouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent(boolean v) {
             mShouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent = v;
             return this;
         }
 
         /** @return A fully constructed {@link ExternalNavigationParams} object. */
         public ExternalNavigationParams build() {
             return new ExternalNavigationParams(mUrl, mIsIncognito, mReferrerUrl, mPageTransition,
                     mIsRedirect, mApplicationMustBeInForeground, mRedirectHandler, mTab,
-                    mOpenInNewTab, mIsBackgroundTabNavigation, mIsMainFrame, mIsWebApk,
+                    mOpenInNewTab, mIsBackgroundTabNavigation, mIsMainFrame, mWebApkPackageName,
                     mHasUserGesture, mShouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent);
         }
     }
 }