Pass in extra parameters to WebApkBuilder#buildWebApkAsync()

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"
@@ skipping 23 matching lines @@
 using base::android::ConvertJavaStringToUTF16;
 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,
+    const GURL& app_icon_url,
     SkBitmap* app_icon,
-    const content::Manifest& web_app_data)
+    const GURL& manifest_url,
+    const content::Manifest& manifest)
     : data_fetcher_(data_fetcher),
       app_title_(app_title),
+      app_icon_url_(app_icon_url),
       app_icon_(app_icon),
       event_request_id_(event_request_id),
-      web_app_data_(web_app_data),
+      manifest_url_(manifest_url),
+      manifest_(manifest),
       has_user_interaction_(false) {
-  DCHECK(!web_app_data.IsEmpty());
+  DCHECK(!manifest.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),
       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_) {
     if (!native_app_data_.is_null())
       TrackUserResponse(USER_RESPONSE_NATIVE_APP_IGNORED);
-    else if (!web_app_data_.IsEmpty())
+    else if (!manifest_.IsEmpty())
       TrackUserResponse(USER_RESPONSE_WEB_APP_IGNORED);
   }
 
   TrackDismissEvent(DISMISS_EVENT_DISMISSED);
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_AppBannerInfoBarDelegateAndroid_destroy(env,
                                         java_delegate_.obj());
   java_delegate_.Reset();
 }
 
@@ skipping 92 matching lines @@
 
   web_contents->GetMainFrame()->Send(
       new ChromeViewMsg_AppBannerDismissed(
           web_contents->GetMainFrame()->GetRoutingID(),
           event_request_id_));
 
   if (!native_app_data_.is_null()) {
     TrackUserResponse(USER_RESPONSE_NATIVE_APP_DISMISSED);
     AppBannerSettingsHelper::RecordBannerDismissEvent(
         web_contents, native_app_package_, AppBannerSettingsHelper::NATIVE);
-  } else if (!web_app_data_.IsEmpty()) {
+  } else if (!manifest_.IsEmpty()) {
     TrackUserResponse(USER_RESPONSE_WEB_APP_DISMISSED);
     AppBannerSettingsHelper::RecordBannerDismissEvent(
-        web_contents, web_app_data_.start_url.spec(),
+        web_contents, manifest_.start_url.spec(),
         AppBannerSettingsHelper::WEB);
   }
 }
 
 base::string16 AppBannerInfoBarDelegateAndroid::GetMessageText() const {
   return app_title_;
 }
 
 int AppBannerInfoBarDelegateAndroid::GetButtons() const {
   return BUTTON_OK;
@@ skipping 28 matching lines @@
         native_app_data_.obj(),
         jreferrer.obj());
 
     if (was_opened) {
       TrackDismissEvent(DISMISS_EVENT_APP_OPEN);
     } else {
       TrackInstallEvent(INSTALL_EVENT_NATIVE_APP_INSTALL_TRIGGERED);
     }
     SendBannerAccepted(web_contents, "play");
     return was_opened;
-  } else if (!web_app_data_.IsEmpty()) {
+  } else if (!manifest_.IsEmpty()) {
     TrackUserResponse(USER_RESPONSE_WEB_APP_ACCEPTED);
 
     AppBannerSettingsHelper::RecordBannerInstallEvent(
-        web_contents, web_app_data_.start_url.spec(),
+        web_contents, manifest_.start_url.spec(),
         AppBannerSettingsHelper::WEB);
 
     ShortcutInfo info(GURL::EmptyGURL());
-    info.UpdateFromManifest(web_app_data_);
+    info.UpdateFromManifest(manifest_);
+    info.manifest_url = manifest_url_;
+    info.icon_url = app_icon_url_;
     info.UpdateSource(ShortcutInfo::SOURCE_APP_BANNER);
 
     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");
@@ skipping 27 matching lines @@
 
   TrackDismissEvent(DISMISS_EVENT_BANNER_CLICK);
   return true;
 }
 
 bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env) {
  return RegisterNativesImpl(env);
 }
 
 }  // namespace banners