Store URLs in WebappDataStorage, and purge them when history is cleared.

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"
@@ skipping 110 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_id,
+    const std::string& webapp_scope) {
   // 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,
+      web_contents, image_url, ideal_splash_image_size_in_dp,
       minimum_splash_image_size_in_dp,
-      base::Bind(&ShortcutHelper::StoreWebappData, webapp_id));
+      base::Bind(&ShortcutHelper::StoreWebappData, webapp_id, webapp_scope));
 }
 
 // static
 void ShortcutHelper::StoreWebappData(
     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(
       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 26 matching lines @@
         SkColorGetR(mean_color), SkColorGetG(mean_color),
         SkColorGetB(mean_color));
   }
 
   return gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(result.obj()));
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }