Store standalone web app data in WebappDataStorage as well as the homescreen intent.

chrome/browser/android/banners/app_banner_data_fetcher_android.cc

 // 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.
 
 #include "chrome/browser/android/banners/app_banner_data_fetcher_android.h"
 
 #include <utility>
 
+#include "base/bind.h"
+#include "base/callback.h"
 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/manifest/manifest_icon_selector.h"
 #include "chrome/browser/ui/android/infobars/app_banner_infobar_android.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/screen.h"
 
 namespace banners {
@@ skipping 31 matching lines @@
   native_app_package_ = app_package;
   native_app_data_.Reset(app_data);
   return FetchAppIcon(GetWebContents(), image_url);
 }
 
 std::string AppBannerDataFetcherAndroid::GetAppIdentifier() {
   return native_app_data_.is_null()
       ? AppBannerDataFetcher::GetAppIdentifier() : native_app_package_;
 }
 
-void AppBannerDataFetcherAndroid::FetchWebappSplashScreenImage(
+base::Closure AppBannerDataFetcherAndroid::FetchWebappSplashScreenImageCallback(
     const std::string& webapp_id) {
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   GURL image_url = ManifestIconSelector::FindBestMatchingIcon(
       web_app_data().icons, ideal_splash_image_size_in_dp_,
       minimum_splash_image_size_in_dp_);
 
-  ShortcutHelper::FetchSplashScreenImage(
-      web_contents,
-      image_url,
-      ideal_splash_image_size_in_dp_,
-      minimum_splash_image_size_in_dp_,
-      webapp_id,
-      web_app_data().start_url.spec());
+  return base::Bind(&ShortcutHelper::FetchSplashScreenImage,
+      web_contents, image_url, ideal_splash_image_size_in_dp_,
+      minimum_splash_image_size_in_dp_, webapp_id);
 }
 
 void AppBannerDataFetcherAndroid::ShowBanner(const SkBitmap* icon,
                                              const base::string16& title,
                                              const std::string& referrer) {
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   infobars::InfoBar* infobar = nullptr;
   if (native_app_data_.is_null()) {
@@ skipping 18 matching lines @@
     if (infobar) {
       RecordDidShowBanner("AppBanner.NativeApp.Shown");
       TrackDisplayEvent(DISPLAY_EVENT_NATIVE_APP_BANNER_CREATED);
     }
   }
   InfoBarService::FromWebContents(web_contents)
       ->AddInfoBar(make_scoped_ptr(infobar));
 }
 
 }  // namespace banners