Upstream: Launch WebApkActivity from WebAPK.

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 89 matching lines @@
             finish();
         } else if (!TextUtils.equals(mWebappInfo.id(), newWebappInfo.id())) {
             mWebappInfo = newWebappInfo;
             resetSavedInstanceState();
             if (mIsInitialized) initializeUI(null);
             // TODO(dominickn): send the web app into fullscreen if mDisplayMode is
             // WebDisplayMode.Fullscreen. See crbug.com/581522
         }
     }
 
+    protected boolean isInitialized() {
+        return mIsInitialized;
+    }
+
     private 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 132 matching lines @@
         contentView.addView(mSplashScreen);
 
         mWebappUma.splashscreenVisible();
         mWebappUma.recordSplashscreenBackgroundColor(mWebappInfo.hasValidBackgroundColor()
                 ? WebappUma.SPLASHSCREEN_COLOR_STATUS_CUSTOM
                 : WebappUma.SPLASHSCREEN_COLOR_STATUS_DEFAULT);
         mWebappUma.recordSplashscreenThemeColor(mWebappInfo.hasValidThemeColor()
                 ? WebappUma.SPLASHSCREEN_COLOR_STATUS_CUSTOM
                 : WebappUma.SPLASHSCREEN_COLOR_STATUS_DEFAULT);
 
+        initializeSplashScreenWidgets(backgroundColor);
+    }
+
+    protected void initializeSplashScreenWidgets(final int backgroundColor) {
         final Intent intent = getIntent();
         WebappRegistry.getWebappDataStorage(this, mWebappInfo.id(),
                 new WebappRegistry.FetchWebappDataStorageCallback() {
                     @Override
                     public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
                         if (storage == null) return;
 
                         // The information in the WebappDataStorage may have been purged by the
                         // user clearing their history or not launching the web app recently.
                         // Restore the data if necessary from the intent.
@@ skipping 13 matching lines @@
                             @Override
                             public void onDataRetrieved(Bitmap splashImage) {
                                 initializeSplashScreenWidgets(backgroundColor, splashImage);
                             }
                         });
                     }
                 }
         );
     }
 
-    private void initializeSplashScreenWidgets(int backgroundColor, Bitmap splashImage) {
+    protected void initializeSplashScreenWidgets(int backgroundColor, Bitmap splashImage) {
         Bitmap displayIcon = splashImage == null ? mWebappInfo.icon() : splashImage;
         int minimiumSizeThreshold = getResources().getDimensionPixelSize(
                 R.dimen.webapp_splash_image_size_minimum);
         int bigThreshold = getResources().getDimensionPixelSize(
                 R.dimen.webapp_splash_image_size_threshold);
 
         // Inflate the correct layout for the image.
         int layoutId;
         if (displayIcon == null || displayIcon.getWidth() < minimiumSizeThreshold
                 || (displayIcon == mWebappInfo.icon() && mWebappInfo.isIconGenerated())) {
@@ skipping 295 matching lines @@
         return visible;
     }
 
     // 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;
     }
 }