Pass WebAPK install source to AppBannerInfobarDelegateAndroid constructor.

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/memory/ptr_util.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/android/webapk/webapk_installer.h"
-#include "chrome/browser/android/webapk/webapk_metrics.h"
 #include "chrome/browser/banners/app_banner_manager.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 "components/rappor/rappor_utils.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 21 matching lines @@
 
 // static
 bool AppBannerInfoBarDelegateAndroid::Create(
     content::WebContents* web_contents,
     base::WeakPtr<AppBannerManager> weak_manager,
     const base::string16& app_title,
     std::unique_ptr<ShortcutInfo> shortcut_info,
     std::unique_ptr<SkBitmap> icon,
     int event_request_id,
     bool is_webapk,
-    bool start_install_webapk) {
+    webapk::InstallSource webapk_install_source) {
   const GURL& url = shortcut_info->url;
   auto infobar_delegate =
       base::WrapUnique(new banners::AppBannerInfoBarDelegateAndroid(
           weak_manager, app_title, std::move(shortcut_info), std::move(icon),
-          event_request_id, is_webapk));
+          event_request_id, is_webapk, webapk_install_source));
   auto raw_delegate = infobar_delegate.get();
   auto infobar = base::MakeUnique<AppBannerInfoBarAndroid>(
       std::move(infobar_delegate), url, is_webapk);
   if (!InfoBarService::FromWebContents(web_contents)
            ->AddInfoBar(std::move(infobar)))
     return false;
 
   if (is_webapk) {
-    if (start_install_webapk) {
-      raw_delegate->AcceptWebApk(web_contents);
+    if (webapk_install_source == webapk::INSTALL_SOURCE_MENU) {
+      raw_delegate->Accept();
       webapk::TrackInstallInfoBarShown(webapk::WEBAPK_INFOBAR_SHOWN_FROM_MENU);
-      webapk::TrackInstallSource(webapk::INSTALL_SOURCE_MENU);
     } else {
       webapk::TrackInstallInfoBarShown(
           webapk::WEBAPK_INFOBAR_SHOWN_FROM_BANNER);
     }
   }
 
   return true;
 }
 
 // static
@@ skipping 79 matching lines @@
     TrackInstallEvent(INSTALL_EVENT_NATIVE_APP_INSTALL_COMPLETED);
     UpdateInstallState(env, obj);
   } else if (infobar()->owner()) {
     TrackDismissEvent(DISMISS_EVENT_INSTALL_TIMEOUT);
     infobar()->owner()->RemoveInfoBar(infobar());
   }
 }
 
 bool AppBannerInfoBarDelegateAndroid::AcceptWebApk(
     content::WebContents* web_contents) {
-  has_user_interaction_ = true;
   if (IsInfoEmpty(shortcut_info_))
     return true;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   // |webapk_package_name_| is set when the WebAPK has finished installing.
   // If the |webapk_package_name_| is empty, it means the "Add to Homescreen"
   // button is pressed, so request WebAPK installation. Otherwise, it means
   // the "Open" button is pressed, so open the installed WebAPK.
   if (!webapk_package_name_.empty()) {
     // Open the WebAPK.
     ScopedJavaLocalRef<jstring> java_webapk_package_name =
         base::android::ConvertUTF8ToJavaString(env, webapk_package_name_);
     Java_AppBannerInfoBarDelegateAndroid_openWebApk(env, java_delegate_,
                                                     java_webapk_package_name);
     webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN);
     SendBannerAccepted(web_contents, "web");
     return true;
   }
 
   // Request install the WebAPK.
   install_state_ = INSTALLING;
   TrackUserResponse(USER_RESPONSE_WEB_APP_ACCEPTED);
+  webapk::TrackInstallSource(webapk_install_source_);
   AppBannerSettingsHelper::RecordBannerInstallEvent(
       web_contents, shortcut_info_->url.spec(), AppBannerSettingsHelper::WEB);
 
   Java_AppBannerInfoBarDelegateAndroid_setWebApkInstallingState(
       env, java_delegate_, true);
   UpdateInstallState(env, nullptr);
   WebApkInstaller::FinishCallback callback =
       base::Bind(&AppBannerInfoBarDelegateAndroid::OnWebApkInstallFinished,
                   weak_ptr_factory_.GetWeakPtr());
   ShortcutHelper::InstallWebApkWithSkBitmap(web_contents->GetBrowserContext(),
                                             *shortcut_info_,
                                             *icon_.get(), callback);
   SendBannerAccepted(web_contents, "web");
 
   // Prevent the infobar from disappearing, because the infobar will show
   // "Adding" during the installation process.
   return false;
 }
 
 AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     base::WeakPtr<AppBannerManager> weak_manager,
     const base::string16& app_title,
     std::unique_ptr<ShortcutInfo> shortcut_info,
     std::unique_ptr<SkBitmap> icon,
     int event_request_id,
-    bool is_webapk)
+    bool is_webapk,
+    webapk::InstallSource webapk_install_source)
     : weak_manager_(weak_manager),
       app_title_(app_title),
       shortcut_info_(std::move(shortcut_info)),
       icon_(std::move(icon)),
       event_request_id_(event_request_id),
       has_user_interaction_(false),
       is_webapk_(is_webapk),
       install_state_(INSTALL_NOT_STARTED),
+      webapk_install_source_(webapk_install_source),
       weak_ptr_factory_(this) {
   DCHECK(!IsInfoEmpty(shortcut_info_));
   CreateJavaDelegate();
 }
 
 AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     const base::string16& app_title,
     const base::android::ScopedJavaGlobalRef<jobject>& native_app_data,
     std::unique_ptr<SkBitmap> icon,
     const std::string& native_app_package,
@@ skipping 74 matching lines @@
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(infobar());
   if (!web_contents) {
     TrackDismissEvent(DISMISS_EVENT_ERROR);
     return true;
   }
 
   if (!native_app_data_.is_null())
     return AcceptNativeApp(web_contents);
 
-  if (is_webapk_) {
-    webapk::TrackInstallSource(webapk::INSTALL_SOURCE_BANNER);
+  if (is_webapk_)
     return AcceptWebApk(web_contents);
-  }
 
   return AcceptWebApp(web_contents);
 }
 
 bool AppBannerInfoBarDelegateAndroid::AcceptNativeApp(
     content::WebContents* web_contents) {
   TrackUserResponse(USER_RESPONSE_NATIVE_APP_ACCEPTED);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
@@ skipping 91 matching lines @@
 
   TrackDismissEvent(DISMISS_EVENT_BANNER_CLICK);
   return true;
 }
 
 bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env) {
  return RegisterNativesImpl(env);
 }
 
 }  // namespace banners