webapps: initial addition of splash screen icon downloading

chrome/browser/android/webapps/add_to_homescreen_dialog_helper.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/webapps/add_to_homescreen_dialog_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
+#include "base/guid.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/manifest.h"
 #include "jni/AddToHomescreenDialogHelper_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/color_analysis.h"
 #include "url/gurl.h"
 
 using content::Manifest;
 
-jlong Initialize(JNIEnv* env, jobject obj, jobject java_web_contents) {
+jlong Initialize(JNIEnv* env,
+                 jobject obj,
+                 jobject java_web_contents,
+                 jint ideal_splash_image_size_in_dp,
+                 jint ideal_icon_size_in_dp) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   AddToHomescreenDialogHelper* add_to_homescreen_helper =
-      new AddToHomescreenDialogHelper(env, obj, web_contents);
+      new AddToHomescreenDialogHelper(env, obj, web_contents,
+          ideal_splash_image_size_in_dp, ideal_icon_size_in_dp);
   return reinterpret_cast<intptr_t>(add_to_homescreen_helper);
 }
 
-AddToHomescreenDialogHelper::AddToHomescreenDialogHelper(JNIEnv* env,
-                                             jobject obj,
-                                             content::WebContents* web_contents)
+AddToHomescreenDialogHelper::AddToHomescreenDialogHelper(
+    JNIEnv* env,
+    jobject obj,
+    content::WebContents* web_contents,
+    int ideal_splash_image_size_in_dp,
+    int ideal_icon_size_in_dp)
     : add_shortcut_pending_(false),
-      data_fetcher_(new AddToHomescreenDataFetcher(web_contents, this)) {
+      data_fetcher_(new AddToHomescreenDataFetcher(web_contents,
+          ideal_splash_image_size_in_dp,
+          ideal_icon_size_in_dp,
+          this)) {
   java_ref_.Reset(env, obj);
 }
 
 AddToHomescreenDialogHelper::~AddToHomescreenDialogHelper() {
   data_fetcher_->set_weak_observer(nullptr);
   data_fetcher_ = nullptr;
 }
 
 void AddToHomescreenDialogHelper::OnUserTitleAvailable(
     const base::string16& user_title) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_user_title =
       base::android::ConvertUTF16ToJavaString(env, user_title);
   Java_AddToHomescreenDialogHelper_onUserTitleAvailable(env,
                                                   java_ref_.obj(),
                                                   j_user_title.obj());
 }
 
 void AddToHomescreenDialogHelper::OnDataAvailable(const ShortcutInfo& info,
-                                            const SkBitmap& icon) {
+                                                  const SkBitmap& icon) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon);
 
   Java_AddToHomescreenDialogHelper_onIconAvailable(env,
                                              java_ref_.obj(),
                                              java_bitmap.obj());
 
   if (add_shortcut_pending_)
@@ skipping 45 matching lines @@
     data_fetcher_->shortcut_info().user_title = user_title;
 
   if (data_fetcher_->is_ready()) {
     // If the fetcher isn't ready yet, the shortcut will be added when it is
     // via OnDataAvailable();
     AddShortcut(data_fetcher_->shortcut_info(), data_fetcher_->shortcut_icon());
   }
 }
 
 void AddToHomescreenDialogHelper::AddShortcut(const ShortcutInfo& info,
-                                        const SkBitmap& icon) {
+                                              const SkBitmap& icon) {
   DCHECK(add_shortcut_pending_);
   if (!add_shortcut_pending_)
     return;
   add_shortcut_pending_ = false;
 
   RecordAddToHomescreen();
 
+  const std::string& uid = base::GenerateGUID();
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ShortcutHelper::AddShortcutInBackgroundWithSkBitmap,
                  info,
+                 uid,
                  icon));
+
+  data_fetcher_->FetchSplashScreenImage(uid);
 }
 
 bool AddToHomescreenDialogHelper::RegisterAddToHomescreenDialogHelper(
       JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void AddToHomescreenDialogHelper::RecordAddToHomescreen() {
   // Record that the shortcut has been added, so no banners will be shown
   // for this app.
   content::WebContents* web_contents = data_fetcher_->web_contents();
   if (!web_contents)
     return;
 
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents, web_contents->GetURL(),
       data_fetcher_->shortcut_info().url.spec(),
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
       base::Time::Now());
 }