[Android WebAPKs] Don't navigate WebAPK when launching it from launcher

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

 // Copyright 2016 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.os.Bundle;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.process_launcher.ChildProcessCreationParams;
-import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
 import org.chromium.chrome.browser.metrics.WebApkUma;
 import org.chromium.chrome.browser.tab.BrowserControlsVisibilityDelegate;
 import org.chromium.chrome.browser.tab.InterceptNavigationDelegateImpl;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
 import org.chromium.chrome.browser.tab.TabRedirectHandler;
 import org.chromium.components.navigation_interception.NavigationParams;
-import org.chromium.content_public.browser.LoadUrlParams;
-import org.chromium.ui.base.PageTransition;
 import org.chromium.webapk.lib.client.WebApkServiceConnectionManager;
 
 /**
  * An Activity is designed for WebAPKs (native Android apps) and displays a webapp in a nearly
  * UI-less Chrome.
  */
 public class WebApkActivity extends WebappActivity {
     /** Manages whether to check update for the WebAPK, and starts update check if needed. */
     private WebApkUpdateManager mUpdateManager;
 
     /** Indicates whether launching renderer in WebAPK process is enabled. */
     private boolean mCanLaunchRendererInWebApkProcess;
 
     private final ChildProcessCreationParams mDefaultParams =
             ChildProcessCreationParams.getDefault();
 
     @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        // We could bring a WebAPK hosted WebappActivity to foreground and navigate it to a
-        // different URL. For example, WebAPK "foo" is launched and navigates to
-        // "www.foo.com/foo". In Chrome, user clicks a link "www.foo.com/bar" in Google search
-        // results. After clicking the link, WebAPK "foo" is brought to foreground, and
-        // loads the page of "www.foo.com/bar" at the same time.
-        // The extra {@link ShortcutHelper.EXTRA_URL} provides the URL that the WebAPK will
-        // navigate to.
-        String overrideUrl = intent.getStringExtra(ShortcutHelper.EXTRA_URL);
-        if (overrideUrl != null && isInitialized()
-                && !overrideUrl.equals(getActivityTab().getUrl())) {
-            getActivityTab().loadUrl(
-                    new LoadUrlParams(overrideUrl, PageTransition.AUTO_TOPLEVEL));
-        }
-        if (isInitialized()) {
-            getActivityTab().setWebappManifestScope(mWebappInfo.scopeUri().toString());
-        }
-    }
-
-    @Override
     protected WebappInfo createWebappInfo(Intent intent) {
         return (intent == null) ? WebApkInfo.createEmpty() : WebApkInfo.create(intent);
     }
 
     @Override
+    protected void initializeUI(Bundle savedInstance) {
+        super.initializeUI(savedInstance);
+        getActivityTab().setWebappManifestScope(mWebappInfo.scopeUri().toString());
+    }
+
+    @Override
     protected TabDelegateFactory createTabDelegateFactory() {
         return new WebappDelegateFactory(this) {
             @Override
             public InterceptNavigationDelegateImpl createInterceptNavigationDelegate(Tab tab) {
                 return new InterceptNavigationDelegateImpl(tab) {
                     @Override
                     public ExternalNavigationParams.Builder buildExternalNavigationParams(
                             NavigationParams navigationParams,
                             TabRedirectHandler tabRedirectHandler, boolean shouldCloseTab) {
                         ExternalNavigationParams.Builder builder =
@@ skipping 18 matching lines @@
                     Tab tab) {
                 return new WebApkBrowserControlsDelegate(WebApkActivity.this, tab);
             }
         };
     }
 
     @Override
     public void finishNativeInitialization() {
         super.finishNativeInitialization();
         if (!isInitialized()) return;
-        getActivityTab().setWebappManifestScope(mWebappInfo.scopeUri().toString());
         mCanLaunchRendererInWebApkProcess = ChromeWebApkHost.canLaunchRendererInWebApkProcess();
     }
 
     @Override
     public void onStop() {
         super.onStop();
         WebApkServiceConnectionManager.getInstance().disconnect(
                 ContextUtils.getApplicationContext(), getWebApkPackageName());
     }
 
@@ skipping 76 matching lines @@
     }
 
     @Override
     protected void onDestroyInternal() {
         if (mUpdateManager != null) {
             mUpdateManager.destroy();
         }
         super.onDestroyInternal();
     }
 }