Remove the logic of fetching metadata when launching WebAPKs.

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 215 matching lines @@
     }
 
     /**
      * @return Structure containing data about the webapp currently displayed.
      *         The return value should not be cached.
      */
     WebappInfo getWebappInfo() {
         return mWebappInfo;
     }
 
-    protected int getBackgroundColor() {
-        return ColorUtils.getOpaqueColor(mWebappInfo.backgroundColor(
+    private void initializeWebappData() {
+        final int backgroundColor = ColorUtils.getOpaqueColor(mWebappInfo.backgroundColor(
                 ApiCompatibilityUtils.getColor(getResources(), R.color.webapp_default_bg)));
-    }
 
-    private void initializeWebappData() {
         mSplashScreen = new FrameLayout(this);
-        mSplashScreen.setBackgroundColor(getBackgroundColor());
+        mSplashScreen.setBackgroundColor(backgroundColor);
 
         ViewGroup contentView = (ViewGroup) findViewById(android.R.id.content);
         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) {
         WebappRegistry.getWebappDataStorage(this, mWebappInfo.id(),
                 new WebappRegistry.FetchWebappDataStorageCallback() {
                     @Override
                     public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
-                        onDataStorageFetched(storage);
+                        if (storage == null) {
+                            onStorageIsNull(backgroundColor);
+                            return;
+                        }
+                        updateStorage(storage);
+
+                        // Retrieve the splash image if it exists.
+                        storage.getSplashScreenImage(new WebappDataStorage.FetchCallback<Bitmap>() {
+                            @Override
+                            public void onDataRetrieved(Bitmap splashImage) {
+                                initializeSplashScreenWidgets(backgroundColor, splashImage);
+                            }
+                        });
                     }
                 }
         );
     }
 
-    protected void recordSplashScreenThemeColorUma() {
-        mWebappUma.recordSplashscreenThemeColor(mWebappInfo.hasValidThemeColor()
-                ? WebappUma.SPLASHSCREEN_COLOR_STATUS_CUSTOM
-                : WebappUma.SPLASHSCREEN_COLOR_STATUS_DEFAULT);
-    }
+    protected void onStorageIsNull(int backgroundColor) {}
 
-    protected void onDataStorageFetched(WebappDataStorage storage) {
-        recordSplashScreenThemeColorUma();
-        if (storage == null) return;
-
+    protected void updateStorage(WebappDataStorage storage) {
         // 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.
         storage.updateFromShortcutIntent(getIntent());
 
         // A recent last used time is the indicator that the web app is still
         // present on the home screen, and enables sources such as notifications to
         // launch web apps. Thus, we do not update the last used time when the web
         // app is not directly launched from the home screen, as this interferes
         // with the heuristic.
         if (mWebappInfo.isLaunchedFromHomescreen()) {
             storage.updateLastUsedTime();
         }
-
-        retrieveSplashScreenImage(storage);
     }
 
-    protected void retrieveSplashScreenImage(WebappDataStorage storage) {
-        // Retrieve the splash image if it exists.
-        storage.getSplashScreenImage(new WebappDataStorage.FetchCallback<Bitmap>() {
-            @Override
-            public void onDataRetrieved(Bitmap splashImage) {
-                initializeSplashScreenWidgets(splashImage);
-            }
-        });
-    }
-
-    protected void initializeSplashScreenWidgets(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 28 matching lines @@
                 .inflate(layoutId, mSplashScreen, true);
 
         // Set up the elements of the splash screen.
         TextView appNameView = (TextView) subLayout.findViewById(
                 R.id.webapp_splash_screen_name);
         ImageView splashIconView = (ImageView) subLayout.findViewById(
                 R.id.webapp_splash_screen_icon);
         appNameView.setText(mWebappInfo.name());
         if (splashIconView != null) splashIconView.setImageBitmap(displayIcon);
 
-        if (ColorUtils.shouldUseLightForegroundOnBackground(getBackgroundColor())) {
+        if (ColorUtils.shouldUseLightForegroundOnBackground(backgroundColor)) {
             appNameView.setTextColor(ApiCompatibilityUtils.getColor(getResources(),
                     R.color.webapp_splash_title_light));
         }
     }
 
     private void updateUrlBar() {
         Tab tab = getActivityTab();
         if (tab == null || mUrlBar == null) return;
         mUrlBar.update(tab.getUrl(), tab.getSecurityLevel());
     }
@@ skipping 217 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;
     }
 }