[Android WebAPK] Don't navigate WebAPK as a result of WindowClient.focus()

chrome/android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.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;
 
 import android.content.Intent;
 import android.os.AsyncTask;
 
 import org.chromium.base.ContextUtils;
@@ skipping 41 matching lines @@
     public static void launchTab(final int requestId, final boolean incognito, final String url,
             final int disposition, final String referrerUrl, final int referrerPolicy,
             final String extraHeaders, final ResourceRequestBody postData) {
         final TabDelegate tabDelegate = new TabDelegate(incognito);
 
         // 1. Launch WebAPK if one matches the target URL.
         if (ChromeWebApkHost.isEnabled()) {
             String webApkPackageName =
                     WebApkValidator.queryWebApkPackage(ContextUtils.getApplicationContext(), url);
             if (webApkPackageName != null) {
-                Intent intent =
-                        WebApkNavigationClient.createLaunchWebApkIntent(webApkPackageName, url);
+                Intent intent = WebApkNavigationClient.createLaunchWebApkIntent(
+                        webApkPackageName, url, true /* forceNavigation */);
                 if (intent != null) {
                     intent.putExtra(ShortcutHelper.EXTRA_SOURCE, ShortcutSource.NOTIFICATION);
                     ContextUtils.getApplicationContext().startActivity(intent);
                     return;
                 }
             }
         }
 
         // 2. Launch WebappActivity if one matches the target URL and was opened recently.
         // Otherwise, open the URL in a tab.
@@ skipping 52 matching lines @@
      * @param requestId Id of the tab launching request which has been fulfilled.
      * @param webContents The WebContents instance associated with this request.
      */
     public static void onWebContentsForRequestAvailable(int requestId, WebContents webContents) {
         nativeOnWebContentsForRequestAvailable(requestId, webContents);
     }
 
     private static native void nativeOnWebContentsForRequestAvailable(
             int requestId, WebContents webContents);
 }