[Password Generation] Fixes sending votes about the usage of the password generation popup

chrome/browser/ui/passwords/manage_passwords_bubble_model.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/ui/passwords/manage_passwords_bubble_model.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 62 matching lines @@
 // Class responsible for collecting and reporting all the runtime interactions
 // with the bubble.
 class ManagePasswordsBubbleModel::InteractionKeeper {
  public:
   InteractionKeeper(
       password_manager::InteractionsStats stats,
       password_manager::metrics_util::UIDisplayDisposition display_disposition);
 
   ~InteractionKeeper() = default;
 
-  // Records UMA events and updates the interaction statistics when the bubble
-  // is closed.
+  // Records UMA events, updates the interaction statistics and sends
+  // notifications to the delegate when the bubble is closed.
   void ReportInteractions(const ManagePasswordsBubbleModel* model);
 
   void set_dismissal_reason(
       password_manager::metrics_util::UIDismissalReason reason) {
     dismissal_reason_ = reason;
   }
 
   void set_update_password_submission_event(
       password_manager::metrics_util::UpdatePasswordSubmissionEvent event) {
     update_password_submission_event_ = event;
@@ skipping 98 matching lines @@
     }
   } else if (model->state() !=
              password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {
     // We have separate metrics for the Update bubble so do not record dismissal
     // reason for it.
     metrics_util::LogUIDismissalReason(dismissal_reason_);
   }
 
   if (model->state() == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE ||
       model->state() == password_manager::ui::PENDING_PASSWORD_STATE) {
+    // Send a notification if there was no interaction with the bubble.
+    bool no_interaction =
+        model->state() == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE
+            ? update_password_submission_event_ ==
+                  metrics_util::NO_UPDATE_SUBMISSION
+            : dismissal_reason_ == metrics_util::NO_DIRECT_INTERACTION;
+    if (no_interaction && model->delegate_) {
+      model->delegate_->OnNoInteraction();
+    }
+
+    // Send UMA.
     if (update_password_submission_event_ ==
         metrics_util::NO_UPDATE_SUBMISSION) {
       update_password_submission_event_ =
           model->GetUpdateDismissalReason(NO_INTERACTION);
-      if (model->delegate_ &&
-          model->state() == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE)
-        model->delegate_->OnNoInteractionOnUpdate();
     }
-
     if (update_password_submission_event_ != metrics_util::NO_UPDATE_SUBMISSION)
       LogUpdatePasswordSubmissionEvent(update_password_submission_event_);
   }
 }
 
 ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
     base::WeakPtr<PasswordsModelDelegate> delegate,
     DisplayReason display_reason)
     : password_overridden_(false),
       delegate_(std::move(delegate)) {
@@ skipping 296 matching lines @@
     return metrics_util::NO_UPDATE_SUBMISSION;
   }
   if (state_ != password_manager::ui::PENDING_PASSWORD_UPDATE_STATE)
     return metrics_util::NO_UPDATE_SUBMISSION;
   if (password_overridden_)
     return update_events[3][behavior];
   if (ShouldShowMultipleAccountUpdateUI())
     return update_events[2][behavior];
   return update_events[1][behavior];
 }