Upstream: Add additional checks before creating a WebAPK after clicking "Add to Homescreen"

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/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 69 matching lines @@
       base::android::ConvertUTF16ToJavaString(env, info.short_name);
   ScopedJavaLocalRef<jstring> java_icon_url =
       base::android::ConvertUTF8ToJavaString(env, info.icon_url.spec());
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
   ScopedJavaLocalRef<jstring> java_manifest_url =
       base::android::ConvertUTF8ToJavaString(env, info.manifest_url.spec());
 
   uintptr_t callback_pointer = 0;
-  if (info.display == blink::WebDisplayModeStandalone ||
-      info.display == blink::WebDisplayModeFullscreen) {
+  if (info.type == ShortcutInfo::Type::WEBAPP) {
     // The callback will need to be run after shortcut creation completes in
     // order to download the splash image and save it to the WebappDataStorage.
     // Create a copy of the callback here and send the pointer to Java, which
     // will send it back once the asynchronous shortcut creation process
     // finishes.
     callback_pointer =
         reinterpret_cast<uintptr_t>(new base::Closure(splash_image_callback));
   }
 
   Java_ShortcutHelper_addShortcut(
       env,
       java_webapp_id.obj(),
+      static_cast<int>(info.type),
       java_url.obj(),
       java_user_title.obj(),
       java_name.obj(),
       java_short_name.obj(),
       java_icon_url.obj(),
       java_bitmap.obj(),
       info.display,
       info.orientation,
       info.source,
       info.theme_color,
@@ skipping 111 matching lines @@
   DCHECK(jsplash_image_callback);
   base::Closure* splash_image_callback =
       reinterpret_cast<base::Closure*>(jsplash_image_callback);
   splash_image_callback->Run();
   delete splash_image_callback;
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }