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

chrome/browser/android/banners/app_banner_infobar_delegate_android.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/banners/app_banner_infobar_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.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/android/shortcut_info.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/banners/app_banner_data_fetcher.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/android/infobars/app_banner_infobar_android.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/rappor/rappor_utils.h"
@@ skipping 10 matching lines @@
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 
 namespace banners {
 
 AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     int event_request_id,
     scoped_refptr<AppBannerDataFetcherAndroid> data_fetcher,
     const base::string16& app_title,
     SkBitmap* app_icon,
-    const content::Manifest& web_app_data)
+    const content::Manifest& web_app_data,
+    ShortcutInfo::Type webapp_type)
     : data_fetcher_(data_fetcher),
       app_title_(app_title),
       app_icon_(app_icon),
       event_request_id_(event_request_id),
       web_app_data_(web_app_data),
+      webapp_type_(webapp_type),
       has_user_interaction_(false) {
   DCHECK(!web_app_data.IsEmpty());
   CreateJavaDelegate();
 }
 
 AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     int event_request_id,
     const base::string16& app_title,
     SkBitmap* app_icon,
     const base::android::ScopedJavaGlobalRef<jobject>& native_app_data,
     const std::string& native_app_package,
     const std::string& referrer)
     : app_title_(app_title),
       app_icon_(app_icon),
       event_request_id_(event_request_id),
+      webapp_type_(ShortcutInfo::Type::OTHER),
       native_app_data_(native_app_data),
       native_app_package_(native_app_package),
       referrer_(referrer),
       has_user_interaction_(false) {
   DCHECK(!native_app_data_.is_null());
   CreateJavaDelegate();
 }
 
 AppBannerInfoBarDelegateAndroid::~AppBannerInfoBarDelegateAndroid() {
   if (!has_user_interaction_) {
@@ skipping 167 matching lines @@
   } else if (!web_app_data_.IsEmpty()) {
     TrackUserResponse(USER_RESPONSE_WEB_APP_ACCEPTED);
 
     AppBannerSettingsHelper::RecordBannerInstallEvent(
         web_contents, web_app_data_.start_url.spec(),
         AppBannerSettingsHelper::WEB);
 
     ShortcutInfo info(GURL::EmptyGURL());
     info.UpdateFromManifest(web_app_data_);
     info.UpdateSource(ShortcutInfo::SOURCE_APP_BANNER);
+    info.type = webapp_type_;
 
     const std::string& uid = base::GenerateGUID();
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&ShortcutHelper::AddShortcutInBackgroundWithSkBitmap, info,
                    uid, *app_icon_.get(),
                    data_fetcher_->FetchWebappSplashScreenImageCallback(uid)));
 
     SendBannerAccepted(web_contents, "web");
     return true;
@@ skipping 26 matching lines @@
 
   TrackDismissEvent(DISMISS_EVENT_BANNER_CLICK);
   return true;
 }
 
 bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env) {
  return RegisterNativesImpl(env);
 }
 
 }  // namespace banners