webapps: initial addition of splash screen icon downloading

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 "base/bind.h"
 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
+#include "chrome/browser/banners/app_banner_debug_log.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/manifest/manifest_icon_downloader.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 {
 
 AppBannerDataFetcherAndroid::AppBannerDataFetcherAndroid(
     content::WebContents* web_contents,
     base::WeakPtr<Delegate> weak_delegate,
+    int ideal_splash_icon_size,
     int ideal_icon_size)
-    : AppBannerDataFetcher(web_contents, weak_delegate, ideal_icon_size) {
+    : AppBannerDataFetcher(web_contents, weak_delegate, ideal_icon_size),
+      ideal_splash_icon_size_(ideal_splash_icon_size) {
 }
 
 AppBannerDataFetcherAndroid::~AppBannerDataFetcherAndroid() {
 }
 
 std::string AppBannerDataFetcherAndroid::GetBannerType() {
   return native_app_data_.is_null()
       ? AppBannerDataFetcher::GetBannerType() : "android";
 }
 
 bool AppBannerDataFetcherAndroid::ContinueFetching(
     const base::string16& app_title,
     const std::string& app_package,
     base::android::ScopedJavaLocalRef<jobject> app_data,
     const GURL& image_url) {
   set_app_title(app_title);
   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::OnHasServiceWorker(
+    content::WebContents* web_contents) {
+  // We intercept the data fetch flow and inject downloading of the splash
+  // screen icon at the point just before the app icon is downloaded.
+  GURL icon_url =
+    ManifestIconSelector::FindBestMatchingIcon(
+        web_app_data().icons,
+        ideal_splash_icon_size_,
+        gfx::Screen::GetScreenFor(web_contents->GetNativeView()));
+
+  if (!ManifestIconDownloader::Download(
+          web_contents,
+          icon_url,
+          ideal_splash_icon_size_,
+          base::Bind(&AppBannerDataFetcherAndroid::OnSplashIconFetched,
+                     this))) {
+    OutputDeveloperNotShownMessage(web_contents,
+        kCannotDetermineBestSplashIcon);
+    Cancel();

[mlamouri (slow - plz ping), 2015/08/24 16:43:54]

see below.

[Lalit Maganti, 2015/08/25 11:38:44]

Acknowledged.

+  }
+}
+
+void AppBannerDataFetcherAndroid::OnSplashIconFetched(const SkBitmap& bitmap) {
+  if (!is_active()) return;
+
+  content::WebContents* web_contents = GetWebContents();
+  if (!CheckFetcherIsStillAlive(web_contents)) {
+    Cancel();
+    return;
+  }
+  if (bitmap.drawsNothing()) {
+    OutputDeveloperNotShownMessage(web_contents, kNoSplashIconAvailable);
+    Cancel();

[mlamouri (slow - plz ping), 2015/08/24 16:43:54]

You are making the splashscreen icon a requirement in order to show the app
banner. Is that on purpose? I don't think we should do that for now. We can
check with app banners stackholders whether they are fine with that. At least,
we should require background_color if we require a splashscreen icon.

[Lalit Maganti, 2015/08/25 11:38:44]

Changed according to our discussions.

+    return;
+  }
+
+  splash_icon_.reset(new SkBitmap(bitmap));
+
+  // Continue the fetch cycle as normal.
+  AppBannerDataFetcher::OnHasServiceWorker(web_contents);

[mlamouri (slow - plz ping), 2015/08/24 16:43:54]

Maybe you could do something like:

void AppBannerDataFetcherAndroid::OnHasServiceWorker(WebContents* web_contents)
{
  AppBannerDataFetcher::OnHasServiceWorker(web_contents);

  // The base class already cancelled the process.
  if (!is_active)
    return;

  // Find the splashscreen if any the download it and set it.
}

[Lalit Maganti, 2015/08/25 11:38:44]

This code has been redone completely.

+}
+
 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()) {
     scoped_ptr<AppBannerInfoBarDelegateAndroid> delegate(
         new AppBannerInfoBarDelegateAndroid(
-            event_request_id(), title, new SkBitmap(*icon), web_app_data()));
+            event_request_id(), title, splash_icon_.release(),
+            new SkBitmap(*icon), web_app_data()));
 
     infobar =
         new AppBannerInfoBarAndroid(delegate.Pass(), web_app_data().start_url);
     if (infobar) {
       RecordDidShowBanner("AppBanner.WebApp.Shown");
       TrackDisplayEvent(DISPLAY_EVENT_WEB_APP_BANNER_CREATED);
     }
   } else {
     scoped_ptr<AppBannerInfoBarDelegateAndroid> delegate(
         new AppBannerInfoBarDelegateAndroid(
             event_request_id(), title, new SkBitmap(*icon), native_app_data_,
             native_app_package_, referrer));
     infobar = new AppBannerInfoBarAndroid(delegate.Pass(), native_app_data_);
     if (infobar) {
       RecordDidShowBanner("AppBanner.NativeApp.Shown");
       TrackDisplayEvent(DISPLAY_EVENT_NATIVE_APP_BANNER_CREATED);
     }
   }
   InfoBarService::FromWebContents(web_contents)
       ->AddInfoBar(make_scoped_ptr(infobar));
 }
 
 }  // namespace banners