Make the ShortcutHelper toast instead of send the user home for web app banners

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 <limits>
 
 #include "base/android/jni_android.h"
@@ skipping 198 matching lines @@
     case MANIFEST_ICON_STATUS_FETCHING:
       // ::OnDidDownloadIcon() will call AddShortcutUsingManifestIcon().
       break;
     case MANIFEST_ICON_STATUS_DONE:
       AddShortcutUsingManifestIcon();
       break;
   }
 }
 
 void ShortcutHelper::AddShortcutUsingManifestIcon() {
+  RecordAddToHomescreen();
+
   // Stop observing so we don't get destroyed while doing the last steps.
   Observe(NULL);
 
-  RecordAddToHomescreen();
-
   base::WorkerPool::PostTask(
       FROM_HERE,
       base::Bind(&ShortcutHelper::AddShortcutInBackgroundWithSkBitmap,
                  shortcut_info_,
-                 manifest_icon_),
+                 manifest_icon_,
+                 true),
       true);
 
   Destroy();
 }
 
 void ShortcutHelper::AddShortcutUsingFavicon() {
   RecordAddToHomescreen();
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ skipping 60 matching lines @@
     const favicon_base::FaviconRawBitmapResult& bitmap_result) {
   DCHECK(base::WorkerPool::RunsTasksOnCurrentThread());
 
   SkBitmap icon_bitmap;
   if (bitmap_result.is_valid()) {
     gfx::PNGCodec::Decode(bitmap_result.bitmap_data->front(),
                           bitmap_result.bitmap_data->size(),
                           &icon_bitmap);
   }
 
-  AddShortcutInBackgroundWithSkBitmap(info, icon_bitmap);
+  AddShortcutInBackgroundWithSkBitmap(info, icon_bitmap, true);
 }
 
 void ShortcutHelper::AddShortcutInBackgroundWithSkBitmap(
     const ShortcutInfo& info,
-    const SkBitmap& icon_bitmap) {
+    const SkBitmap& icon_bitmap,
+    const bool return_to_homescreen) {
   DCHECK(base::WorkerPool::RunsTasksOnCurrentThread());
 
   SkColor color = color_utils::CalculateKMeanColorOfBitmap(icon_bitmap);
   int r_value = SkColorGetR(color);
   int g_value = SkColorGetG(color);
   int b_value = SkColorGetB(color);
 
   // Send the data to the Java side to create the shortcut.
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_title =
       base::android::ConvertUTF16ToJavaString(env, info.title);
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
 
   Java_ShortcutHelper_addShortcut(
       env,
       base::android::GetApplicationContext(),
       java_url.obj(),
       java_title.obj(),
       java_bitmap.obj(),
       r_value,
       g_value,
       b_value,
       info.display == content::Manifest::DISPLAY_MODE_STANDALONE,
-      info.orientation);
+      info.orientation,
+      return_to_homescreen);
 }
 
 void ShortcutHelper::RecordAddToHomescreen() {
   // Record that the shortcut has been added, so no banners will be shown
   // for this app.
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents(), shortcut_info_.url, shortcut_info_.url.spec(),
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
       base::Time::Now());
 }