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

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.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.webapps;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
@@ skipping 90 matching lines @@
         super.onNewIntent(intent);
 
         WebappInfo newWebappInfo = createWebappInfo(intent);
         if (newWebappInfo == null) {
             Log.e(TAG, "Failed to parse new Intent: " + intent);
             ApiCompatibilityUtils.finishAndRemoveTask(this);
         } else if (!TextUtils.equals(mWebappInfo.id(), newWebappInfo.id())) {
             mWebappInfo = newWebappInfo;
             resetSavedInstanceState();
             if (mIsInitialized) initializeUI(null);
+        } else if (newWebappInfo.shouldForceNavigation() && mIsInitialized) {
+            getActivityTab().loadUrl(new LoadUrlParams(
+                    newWebappInfo.uri().toString(), PageTransition.AUTO_TOPLEVEL));
         }
     }
 
     protected boolean isInitialized() {
         return mIsInitialized;
     }
 
     protected WebappInfo createWebappInfo(Intent intent) {
         return (intent == null) ? WebappInfo.createEmpty() : WebappInfo.create(intent);
     }
 
-    private void initializeUI(Bundle savedInstanceState) {
+    protected void initializeUI(Bundle savedInstanceState) {
         // We do not load URL when restoring from saved instance states.
         if (savedInstanceState == null && mWebappInfo.isInitialized()) {
             if (TextUtils.isEmpty(getActivityTab().getUrl())) {
                 getActivityTab().loadUrl(new LoadUrlParams(
                         mWebappInfo.uri().toString(), PageTransition.AUTO_TOPLEVEL));
             }
         } else {
             if (NetworkChangeNotifier.isOnline()) getActivityTab().reloadIgnoringCache();
         }
 
@@ skipping 569 matching lines @@
         return new WebappDelegateFactory(this);
     }
 
     // We're temporarily disable CS on webapp since there are some issues. (http://crbug.com/471950)
     // TODO(changwan): re-enable it once the issues are resolved.
     @Override
     protected boolean isContextualSearchAllowed() {
         return false;
     }
 }