WebAPKs: Open links which are outside of WebAPK scope in Chrome not in WebAPK

chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.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 android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
@@ skipping 46 matching lines @@
         /* We should override the URL loading and clobber the current tab. */
         OVERRIDE_WITH_CLOBBERING_TAB,
         /* We should override the URL loading.  The desired action will be determined
          * asynchronously (e.g. by requiring user confirmation). */
         OVERRIDE_WITH_ASYNC_ACTION,
         /* We shouldn't override the URL loading. */
         NO_OVERRIDE,
     }
 
     /**
-     * A constructor for UrlHandler.
-     *
-     * @param tab The tab that initiated the external intent.
+     * Creates {@link ExternalNavigationHandler} with default arguments.
+     * @param tab The associated tab.
+     * @return The ExternalNavigationHandler.
      */
-    public ExternalNavigationHandler(Tab tab) {
-        this(new ExternalNavigationDelegateImpl(tab));
+    public static ExternalNavigationHandler createDefault(Tab tab) {
+        return new ExternalNavigationHandler(new ExternalNavigationDelegateImpl(tab, null));
     }
 
     /**
      * Constructs a new instance of {@link ExternalNavigationHandler}, using the injected
      * {@link ExternalNavigationDelegate}.
      */
     public ExternalNavigationHandler(ExternalNavigationDelegate delegate) {
         mDelegate = delegate;
     }
 
@@ skipping 208 matching lines @@
         // whether we can download it from the Market.
         if (!canResolveActivity) {
             if (hasBrowserFallbackUrl) {
                 return clobberCurrentTabWithFallbackUrl(browserFallbackUrl, params);
             }
             String packagename = intent.getPackage();
             if (packagename != null) {
                 try {
                     intent = new Intent(Intent.ACTION_VIEW, Uri.parse(
                             "market://details?id=" + packagename
-                            + "&referrer=" + mDelegate.getPackageName()));
+                            + "&referrer=" + mDelegate.getBrowserPackageName()));
                     intent.addCategory(Intent.CATEGORY_BROWSABLE);
                     intent.setPackage("com.android.vending");
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     mDelegate.startActivity(intent);
                     return OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT;
                 } catch (ActivityNotFoundException ex) {
                     // ignore the error on devices that does not have
                     // play market installed.
                     return OverrideUrlLoadingResult.NO_OVERRIDE;
                 }
             } else {
                 return OverrideUrlLoadingResult.NO_OVERRIDE;
             }
         }
 
         if (hasBrowserFallbackUrl) {
             intent.removeExtra(EXTRA_BROWSER_FALLBACK_URL);
         }
 
         if (intent.getPackage() == null) {
             final Uri uri = intent.getData();
             if (uri != null && SCHEME_SMS.equals(uri.getScheme())) {
                 intent.setPackage(getDefaultSmsPackageName(resolvingInfos));
             }
         }
 
         // Set the Browser application ID to us in case the user chooses Chrome
         // as the app.  This will make sure the link is opened in the same tab
         // instead of making a new one.
-        intent.putExtra(Browser.EXTRA_APPLICATION_ID, mDelegate.getPackageName());
+        intent.putExtra(Browser.EXTRA_APPLICATION_ID, mDelegate.getBrowserPackageName());
         if (params.isOpenInNewTab()) intent.putExtra(Browser.EXTRA_CREATE_NEW_TAB, true);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mDelegate.maybeSetWindowId(intent);
 
         if (params.getReferrerUrl() != null) {
             IntentHandler.setPendingReferrer(intent, params.getReferrerUrl());
         }
 
         // Make sure webkit can handle it internally before checking for specialized
         // handlers. If webkit can't handle it internally, we need to call
         // startActivityIfNeeded or startActivity.
         if (!isExternalProtocol) {
             if (!mDelegate.isSpecializedHandlerAvailable(resolvingInfos)) {
+                if (mDelegate.getWebApkPackageName() != null) {
+                    mDelegate.startChromeActivity(params.getUrl());

[Maria, 2016/05/31 23:31:21]

We shouldn't be re-creating the logic for generating an intent inside
startChromeActivity(). Pass in the intent we've generated so far -- it should be
correct. The only thing you might need to do in this method is set the package
to ensure it goes directly to Chrome.

+                    return OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT;
+                }
                 return OverrideUrlLoadingResult.NO_OVERRIDE;
             } else if (params.getReferrerUrl() != null && (isLink || isFormSubmit)) {
                 // Current URL has at least one specialized handler available. For navigations
                 // within the same host, keep the navigation inside the browser unless the set of
                 // available apps to handle the new navigation is different. http://crbug.com/463138
                 URI currentUri;
                 URI previousUri;
                 try {
                     currentUri = new URI(params.getUrl());
                     previousUri = new URI(params.getReferrerUrl());
@@ skipping 114 matching lines @@
         if (defaultSmsPackageName == null) return null;
         // Makes sure that the default SMS app actually resolves the intent.
         for (ResolveInfo resolveInfo : resolvingComponentNames) {
             if (defaultSmsPackageName.equals(resolveInfo.activityInfo.packageName)) {
                 return defaultSmsPackageName;
             }
         }
         return null;
     }
 }