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

chrome/browser/android/shortcut_helper.cc

 // Copyright 2013 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/shortcut_helper.h"
 
 #include <jni.h>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "base/bind.h"
+#include "base/callback.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ShortcutHelper_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/color_analysis.h"
 #include "url/gurl.h"
 
@@ skipping 32 matching lines @@
   DCHECK(kMinimumHomescreenIconSize <= kIdealHomescreenIconSize);
   DCHECK(kMinimumSplashImageSize <= kIdealSplashImageSize);
 }
 
 } // anonymous namespace
 
 // static
 void ShortcutHelper::AddShortcutInBackgroundWithSkBitmap(
     const ShortcutInfo& info,
     const std::string& webapp_id,
-    const SkBitmap& icon_bitmap) {
+    const SkBitmap& icon_bitmap,
+    const base::Closure& splash_image_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   // Send the data to the Java side to create the shortcut.
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
       base::android::ConvertUTF8ToJavaString(env, webapp_id);
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_user_title =
       base::android::ConvertUTF16ToJavaString(env, info.user_title);
   ScopedJavaLocalRef<jstring> java_name =
       base::android::ConvertUTF16ToJavaString(env, info.name);
   ScopedJavaLocalRef<jstring> java_short_name =
       base::android::ConvertUTF16ToJavaString(env, info.short_name);
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
 
+  uintptr_t callback_pointer = reinterpret_cast<uintptr_t>(

[gone, 2016/04/01 23:44:48]

Don't we know whether the callback will be used at this point?  Does it make
sense to just not create it, then pass 0 in that case?

[dominickn, 2016/04/04 07:26:24]

That's a good point. This cleans up the mess here considerably.

+      new base::Closure(splash_image_callback));
+
   Java_ShortcutHelper_addShortcut(
       env,
       base::android::GetApplicationContext(),
       java_webapp_id.obj(),
       java_url.obj(),
       java_user_title.obj(),
       java_name.obj(),
       java_short_name.obj(),
       java_bitmap.obj(),
       info.display == blink::WebDisplayModeStandalone,
       info.orientation,
       info.source,
       info.theme_color,
       info.background_color,
-      info.is_icon_generated);
+      info.is_icon_generated,
+      callback_pointer);
 }
 
 int ShortcutHelper::GetIdealHomescreenIconSizeInDp() {
   if (kIdealHomescreenIconSize == -1)
     GetHomescreenIconAndSplashImageSizes();
   return kIdealHomescreenIconSize;
 }
 
 int ShortcutHelper::GetMinimumHomescreenIconSizeInDp() {
   if (kMinimumHomescreenIconSize == -1)
@@ skipping 12 matching lines @@
     GetHomescreenIconAndSplashImageSizes();
   return kMinimumSplashImageSize;
 }
 
 // static
 void ShortcutHelper::FetchSplashScreenImage(
     content::WebContents* web_contents,
     const GURL& image_url,
     const int ideal_splash_image_size_in_dp,
     const int minimum_splash_image_size_in_dp,
-    const std::string& webapp_id,
-    const std::string& webapp_scope) {
+    const std::string& webapp_id) {
   // This is a fire and forget task. It is not vital for the splash screen image
   // to be downloaded so if the downloader returns false there is no fallback.
   ManifestIconDownloader::Download(
       web_contents, image_url, ideal_splash_image_size_in_dp,
       minimum_splash_image_size_in_dp,
-      base::Bind(&ShortcutHelper::StoreWebappData, webapp_id, webapp_scope));
+      base::Bind(&ShortcutHelper::StoreWebappSplashImage, webapp_id));
 }
 
 // static
-void ShortcutHelper::StoreWebappData(
+void ShortcutHelper::StoreWebappSplashImage(
     const std::string& webapp_id,
-    const std::string& webapp_url,
     const SkBitmap& splash_image) {
   if (splash_image.drawsNothing())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
       base::android::ConvertUTF8ToJavaString(env, webapp_id);
-  ScopedJavaLocalRef<jstring> java_webapp_url =
-      base::android::ConvertUTF8ToJavaString(env, webapp_url);
   ScopedJavaLocalRef<jobject> java_splash_image =
       gfx::ConvertToJavaBitmap(&splash_image);
 
-  Java_ShortcutHelper_storeWebappData(
+  Java_ShortcutHelper_storeWebappSplashImage(
       env,
       base::android::GetApplicationContext(),
       java_webapp_id.obj(),
-      java_webapp_url.obj(),
       java_splash_image.obj());
 }
 
 // static
 SkBitmap ShortcutHelper::FinalizeLauncherIcon(const SkBitmap& bitmap,
                                               const GURL& url,
                                               bool* is_generated) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   JNIEnv* env = base::android::AttachCurrentThread();
@@ skipping 23 matching lines @@
     *is_generated = true;
     result = Java_ShortcutHelper_generateHomeScreenIcon(
         env, base::android::GetApplicationContext(), java_url.obj(),
         SkColorGetR(mean_color), SkColorGetG(mean_color),
         SkColorGetB(mean_color));
   }
 
   return gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(result.obj()));
 }
 
+// Callback used by Java when the shortcut has been created. If the shortcut
+// was for a webapp capable site, run the splashscreen_callback.
+void OnWebappDataStored(JNIEnv* env,
+                        const JavaParamRef<jclass>& clazz,
+                        jlong jsplash_image_callback,
+                        jboolean jwebapp_capable) {
+  base::Closure* splash_image_callback =
+      reinterpret_cast<base::Closure*>(jsplash_image_callback);
+  if (jwebapp_capable)
+    splash_image_callback->Run();
+
+  delete splash_image_callback;
+}
+
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }