[Password Generation] Trigger confirmation bubble when a password is saved

chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

Index: chrome/browser/ui/passwords/manage_passwords_bubble_model.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc b/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc
index e18bcc805e3dc0e19026043f8830b6f7460bc999..e103678f36c543168a2be0c507bdbb299e35f84a 100644
--- a/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 
+#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -15,13 +17,14 @@
 
 using autofill::PasswordFormMap;
 using content::WebContents;
+namespace metrics_util = password_manager::metrics_util;
 
 ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       display_disposition_(
-          password_manager::metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
-      dismissal_reason_(password_manager::metrics_util::NOT_DISPLAYED) {
+          metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
+      dismissal_reason_(metrics_util::NOT_DISPLAYED) {
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents);
 
@@ -33,12 +36,26 @@ ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
     pending_credentials_ = controller->PendingCredentials();
   best_matches_ = controller->best_matches();
 
-  if (password_manager::ui::IsPendingState(state_))
+  if (password_manager::ui::IsPendingState(state_)) {
     title_ = l10n_util::GetStringUTF16(IDS_SAVE_PASSWORD);
-  else if (state_ == password_manager::ui::BLACKLIST_STATE)
+  } else if (state_ == password_manager::ui::BLACKLIST_STATE) {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_BLACKLISTED_TITLE);
-  else
+  } else if (state_ == password_manager::ui::CONFIRMATION_STATE) {
+    title_ =
+        l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TITLE);
+  } else {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_TITLE);
+  }
+
+  std::vector<base::string16> pieces;
+  base::SplitStringDontTrim(
+      l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT),
+      '|',  // separator
+      &pieces);
+  DCHECK_EQ(3u, pieces.size());
+  save_confirmation_link_range_ =
+      gfx::Range(pieces[0].size(), pieces[0].size() + pieces[1].size());
+  save_confirmation_text_ = JoinString(pieces, base::string16());

[Mike West, 2014/07/17 13:43:17]

Nit: This could probably be split out to a helper for clarity.

[Garrett Casto, 2014/07/17 20:54:55]

Done.

 
   manage_link_ =
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK);
@@ -50,41 +67,42 @@ void ManagePasswordsBubbleModel::OnBubbleShown(
     ManagePasswordsBubble::DisplayReason reason) {
   if (reason == ManagePasswordsBubble::USER_ACTION) {
     if (password_manager::ui::IsPendingState(state_)) {
-      display_disposition_ =
-          password_manager::metrics_util::MANUAL_WITH_PASSWORD_PENDING;
+      display_disposition_ = metrics_util::MANUAL_WITH_PASSWORD_PENDING;
     } else if (state_ == password_manager::ui::BLACKLIST_STATE) {
-      display_disposition_ = password_manager::metrics_util::MANUAL_BLACKLISTED;
+      display_disposition_ = metrics_util::MANUAL_BLACKLISTED;
     } else {
-      display_disposition_ =
-          password_manager::metrics_util::MANUAL_MANAGE_PASSWORDS;
+      display_disposition_ = metrics_util::MANUAL_MANAGE_PASSWORDS;
     }
   } else {
-    DCHECK(password_manager::ui::IsPendingState(state_));
-    display_disposition_ =
-        password_manager::metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING;
+    if (state_ == password_manager::ui::CONFIRMATION_STATE) {
+      display_disposition_ =
+          metrics_util::AUTOMATIC_GENERATED_PASSWORD_CONFIRMATION;
+    } else {
+      display_disposition_ = metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING;
+    }
   }
-  password_manager::metrics_util::LogUIDisplayDisposition(display_disposition_);
+  metrics_util::LogUIDisplayDisposition(display_disposition_);
 
   // Default to a dismissal reason of "no interaction". If the user interacts
   // with the button in such a way that it closes, we'll reset this value
   // accordingly.
-  dismissal_reason_ = password_manager::metrics_util::NO_DIRECT_INTERACTION;
+  dismissal_reason_ = metrics_util::NO_DIRECT_INTERACTION;
 }
 
 void ManagePasswordsBubbleModel::OnBubbleHidden() {
-  if (dismissal_reason_ == password_manager::metrics_util::NOT_DISPLAYED)
+  if (dismissal_reason_ == metrics_util::NOT_DISPLAYED)
     return;
 
-  password_manager::metrics_util::LogUIDismissalReason(dismissal_reason_);
+  metrics_util::LogUIDismissalReason(dismissal_reason_);
 }
 
 void ManagePasswordsBubbleModel::OnNopeClicked() {
-  dismissal_reason_ = password_manager::metrics_util::CLICKED_NOPE;
+  dismissal_reason_ = metrics_util::CLICKED_NOPE;
   state_ = password_manager::ui::PENDING_PASSWORD_STATE;
 }
 
 void ManagePasswordsBubbleModel::OnNeverForThisSiteClicked() {
-  dismissal_reason_ = password_manager::metrics_util::CLICKED_NEVER;
+  dismissal_reason_ = metrics_util::CLICKED_NEVER;
   ManagePasswordsUIController* manage_passwords_ui_controller =
       ManagePasswordsUIController::FromWebContents(web_contents());
   manage_passwords_ui_controller->NeverSavePassword();
@@ -92,7 +110,7 @@ void ManagePasswordsBubbleModel::OnNeverForThisSiteClicked() {
 }
 
 void ManagePasswordsBubbleModel::OnUnblacklistClicked() {
-  dismissal_reason_ = password_manager::metrics_util::CLICKED_UNBLACKLIST;
+  dismissal_reason_ = metrics_util::CLICKED_UNBLACKLIST;
   ManagePasswordsUIController* manage_passwords_ui_controller =
       ManagePasswordsUIController::FromWebContents(web_contents());
   manage_passwords_ui_controller->UnblacklistSite();
@@ -100,7 +118,7 @@ void ManagePasswordsBubbleModel::OnUnblacklistClicked() {
 }
 
 void ManagePasswordsBubbleModel::OnSaveClicked() {
-  dismissal_reason_ = password_manager::metrics_util::CLICKED_SAVE;
+  dismissal_reason_ = metrics_util::CLICKED_SAVE;
   ManagePasswordsUIController* manage_passwords_ui_controller =
       ManagePasswordsUIController::FromWebContents(web_contents());
   manage_passwords_ui_controller->SavePassword();
@@ -108,15 +126,25 @@ void ManagePasswordsBubbleModel::OnSaveClicked() {
 }
 
 void ManagePasswordsBubbleModel::OnDoneClicked() {
-  dismissal_reason_ = password_manager::metrics_util::CLICKED_DONE;
+  dismissal_reason_ = metrics_util::CLICKED_DONE;
+}
+
+void ManagePasswordsBubbleModel::OnOKClicked() {
+  dismissal_reason_ = metrics_util::CLICKED_OK;

[Mike West, 2014/07/17 13:43:17]

Since we now have "done" and "ok", we should probably rename them to something
more usably descriptive, as it's not going to be clear to me which is which next
time I look at this code. :)

Not in this CL, though, it's already big and refactory enough.

[Garrett Casto, 2014/07/17 20:54:55]

I'll add a TODO to merge these. I don't know if the granularity is worth keeping
track of.

 }
 
 void ManagePasswordsBubbleModel::OnManageLinkClicked() {
-  dismissal_reason_ = password_manager::metrics_util::CLICKED_MANAGE;
+  dismissal_reason_ = metrics_util::CLICKED_MANAGE;
   ManagePasswordsUIController::FromWebContents(web_contents())
       ->NavigateToPasswordManagerSettingsPage();
 }
 
+void ManagePasswordsBubbleModel::OnRemoteManageLinkClicked() {
+  dismissal_reason_ = metrics_util::CLICKED_MANAGE;

[Mike West, 2014/07/17 13:43:17]

Do we want to treat these as the same? If we're splitting "done" and "ok", we
should split these too. I'm equally happy to just treat them both as manage, and
both the "please go away, bubble." buttons as the same as well. No idea if the
granularity is useful.

[Garrett Casto, 2014/07/17 20:54:55]

I'm actually wondering if it's worth adding granularity here. The normal manage
link and AC manage link get shown in pretty different contexts, and I can
imagine users react pretty differently too them. Added a TODO to look into that
as well.

+  ManagePasswordsUIController::FromWebContents(web_contents())
+      ->NavigateToAccountCentralManagementPage();
+}
+
 void ManagePasswordsBubbleModel::OnPasswordAction(
     const autofill::PasswordForm& password_form,
     PasswordAction action) {