Ensure WebAPKs installed from the menu do not pollute banner statistics.

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 96 matching lines @@
            std::move(infobar_delegate), native_app_data));
 }
 
 AppBannerInfoBarDelegateAndroid::~AppBannerInfoBarDelegateAndroid() {
   weak_ptr_factory_.InvalidateWeakPtrs();
 
   if (!has_user_interaction_) {
     if (!native_app_data_.is_null()) {
       TrackUserResponse(USER_RESPONSE_NATIVE_APP_IGNORED);
     } else {
-      TrackUserResponse(USER_RESPONSE_WEB_APP_IGNORED);
+      if (TriggeredFromBanner())
+        TrackUserResponse(USER_RESPONSE_WEB_APP_IGNORED);
       if (is_webapk_)
         webapk::TrackInstallEvent(webapk::INFOBAR_IGNORED);
     }
   }
 
-  TrackDismissEvent(DISMISS_EVENT_DISMISSED);
+  if (TriggeredFromBanner())
+    TrackDismissEvent(DISMISS_EVENT_DISMISSED);
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_AppBannerInfoBarDelegateAndroid_destroy(env, java_delegate_);
   java_delegate_.Reset();
 }
 
 void AppBannerInfoBarDelegateAndroid::UpdateInstallState(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   if (native_app_data_.is_null() && !is_webapk_)
     return;
@@ skipping 43 matching lines @@
     infobar()->owner()->RemoveInfoBar(infobar());
   }
 }
 
 bool AppBannerInfoBarDelegateAndroid::Accept() {
   has_user_interaction_ = true;
 
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(infobar());
   if (!web_contents) {
-    TrackDismissEvent(DISMISS_EVENT_ERROR);
+    if (TriggeredFromBanner())
+      TrackDismissEvent(DISMISS_EVENT_ERROR);
     return true;
   }
 
   if (!native_app_data_.is_null())
     return AcceptNativeApp(web_contents);
 
   if (is_webapk_)
     return AcceptWebApk(web_contents);
 
   return AcceptWebApp(web_contents);
@@ skipping 116 matching lines @@
   // WebAPK.
   if (install_state_ == INSTALLED) {
     Java_AppBannerInfoBarDelegateAndroid_openWebApk(env, java_delegate_);
     if (is_webapk_already_installed_)
       webapk::TrackUserAction(webapk::USER_ACTION_OPEN);
     else
       webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN);
     SendBannerAccepted();
     return true;
   }
 

[pkotwicz, 2016/11/04 01:34:33]

Nit: Move the comment on lines 337 - 338 here. The code below belongs to
handling the "Add to Homescreen" button, not the "Open" button button

[dominickn, 2016/11/04 01:44:51]

Done.

+  if (TriggeredFromBanner()) {
+    TrackUserResponse(USER_RESPONSE_WEB_APP_ACCEPTED);
+    AppBannerSettingsHelper::RecordBannerInstallEvent(
+        web_contents, shortcut_info_->url.spec(), AppBannerSettingsHelper::WEB);
+  }
+
+  install_state_ = INSTALLING;
+  webapk::TrackInstallSource(webapk_install_source_);
+
   // If the WebAPK is not installed and the "Add to Home Screen" button is
   // clicked, 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();
 
   // Prevent the infobar from disappearing, because the infobar will show
   // "Adding" during the installation process.
   return false;
 }
 
+bool AppBannerInfoBarDelegateAndroid::TriggeredFromBanner() const {
+  return !is_webapk_ || webapk_install_source_ == webapk::INSTALL_SOURCE_BANNER;
+}
+
 void AppBannerInfoBarDelegateAndroid::SendBannerAccepted() {
-  if (weak_manager_)
+  if (weak_manager_ && TriggeredFromBanner())
     weak_manager_->SendBannerAccepted(event_request_id_);
 }
 
 void AppBannerInfoBarDelegateAndroid::OnWebApkInstallFinished(
     bool success,
     const std::string& webapk_package_name) {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!success) {
     DVLOG(1) << "The WebAPK installation failed.";
     Java_AppBannerInfoBarDelegateAndroid_showWebApkInstallFailureToast(env);
@@ skipping 31 matching lines @@
 gfx::Image AppBannerInfoBarDelegateAndroid::GetIcon() const {
   return gfx::Image::CreateFrom1xBitmap(*icon_.get());
 }
 
 void AppBannerInfoBarDelegateAndroid::InfoBarDismissed() {
   has_user_interaction_ = true;
 
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(infobar());
 
-  if (weak_manager_)
+  if (weak_manager_ && TriggeredFromBanner())
     weak_manager_->SendBannerDismissed(event_request_id_);
 
   if (native_app_data_.is_null()) {
     if (is_webapk_)
       TrackWebApkInstallationDismissEvents(install_state_);
-    TrackUserResponse(USER_RESPONSE_WEB_APP_DISMISSED);
-    AppBannerSettingsHelper::RecordBannerDismissEvent(
-        web_contents, shortcut_info_->url.spec(), AppBannerSettingsHelper::WEB);
+    if (TriggeredFromBanner()) {
+      TrackUserResponse(USER_RESPONSE_WEB_APP_DISMISSED);
+      AppBannerSettingsHelper::RecordBannerDismissEvent(
+          web_contents, shortcut_info_->url.spec(),
+          AppBannerSettingsHelper::WEB);
+    }
   } else {
     TrackUserResponse(USER_RESPONSE_NATIVE_APP_DISMISSED);
     AppBannerSettingsHelper::RecordBannerDismissEvent(
         web_contents, native_app_package_, AppBannerSettingsHelper::NATIVE);
   }
 }
 
 base::string16 AppBannerInfoBarDelegateAndroid::GetMessageText() const {
   return app_title_;
 }
@@ skipping 20 matching lines @@
 
   TrackDismissEvent(DISMISS_EVENT_BANNER_CLICK);
   return true;
 }
 
 bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace banners