Show user credentials chooser bubble.

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 "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
@@ skipping 36 matching lines @@
 
 ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       display_disposition_(
           metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
       dismissal_reason_(metrics_util::NOT_DISPLAYED) {
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents);
 
-  // TODO(mkwst): Reverse this logic. The controller should populate the model
-  // directly rather than the model pulling from the controller. Perhaps like
-  // `controller->PopulateModel(this)`.
-  state_ = controller->state();
-  if (password_manager::ui::IsPendingState(state_))
-    pending_credentials_ = controller->PendingCredentials();
-  best_matches_ = controller->best_matches();
+  InitPasswordsModelFromController(controller, this);
 
   if (password_manager::ui::IsPendingState(state_)) {
     title_ = l10n_util::GetStringUTF16(IDS_SAVE_PASSWORD);
   } else if (state_ == password_manager::ui::BLACKLIST_STATE) {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_BLACKLISTED_TITLE);
   } else if (state_ == password_manager::ui::CONFIRMATION_STATE) {
     title_ =
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TITLE);
+  } else if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
+    title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CHOOSE_TITLE);
   } else {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_TITLE);
   }
 
   base::string16 save_confirmation_link =
       l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_LINK);
   size_t offset;
   save_confirmation_text_ =
       l10n_util::GetStringFUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT,
                                  save_confirmation_link, &offset);
@@ skipping 13 matching lines @@
       display_disposition_ = metrics_util::MANUAL_WITH_PASSWORD_PENDING;
     } else if (state_ == password_manager::ui::BLACKLIST_STATE) {
       display_disposition_ = metrics_util::MANUAL_BLACKLISTED;
     } else {
       display_disposition_ = metrics_util::MANUAL_MANAGE_PASSWORDS;
     }
   } else {
     if (state_ == password_manager::ui::CONFIRMATION_STATE) {
       display_disposition_ =
           metrics_util::AUTOMATIC_GENERATED_PASSWORD_CONFIRMATION;
+    } else if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
+      display_disposition_ = metrics_util::AUTOMATIC_WITH_CREDENTIALS_PENDING;
     } else {
       display_disposition_ = metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING;
     }
   }
   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_ = metrics_util::NO_DIRECT_INTERACTION;
+
+  ManagePasswordsUIController* controller =
+      ManagePasswordsUIController::FromWebContents(web_contents());
+  controller->OnBubbleShown();
 }
 
 void ManagePasswordsBubbleModel::OnBubbleHidden() {
+  if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
+    // It's time to run the pending callback if it wasn't called in
+    // OnChooseCredentials().
+    ManagePasswordsUIController* manage_passwords_ui_controller =
+        ManagePasswordsUIController::FromWebContents(web_contents());
+    manage_passwords_ui_controller->ChooseCredential(false,
+                                                     autofill::PasswordForm());
+    state_ = password_manager::ui::INACTIVE_STATE;
+  }
   if (dismissal_reason_ == metrics_util::NOT_DISPLAYED)
     return;
 
   metrics_util::LogUIDismissalReason(dismissal_reason_);
   // Other use cases have been reported in the callbacks like OnSaveClicked().
   if (dismissal_reason_ == metrics_util::NO_DIRECT_INTERACTION)
     RecordExperimentStatistics(web_contents(), dismissal_reason_);
 }
 
 void ManagePasswordsBubbleModel::OnNopeClicked() {
   dismissal_reason_ = metrics_util::CLICKED_NOPE;
   RecordExperimentStatistics(web_contents(), dismissal_reason_);
-  state_ = password_manager::ui::PENDING_PASSWORD_STATE;
+  if (state_ != password_manager::ui::CREDENTIAL_REQUEST_STATE)
+    state_ = password_manager::ui::PENDING_PASSWORD_STATE;
 }
 
 void ManagePasswordsBubbleModel::OnNeverForThisSiteClicked() {
   dismissal_reason_ = metrics_util::CLICKED_NEVER;
   RecordExperimentStatistics(web_contents(), dismissal_reason_);
   ManagePasswordsUIController* manage_passwords_ui_controller =
       ManagePasswordsUIController::FromWebContents(web_contents());
   manage_passwords_ui_controller->NeverSavePassword();
   state_ = password_manager::ui::BLACKLIST_STATE;
 }
@@ skipping 41 matching lines @@
   password_manager::PasswordStore* password_store =
       PasswordStoreFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS)
           .get();
   DCHECK(password_store);
   if (action == REMOVE_PASSWORD)
     password_store->RemoveLogin(password_form);
   else
     password_store->AddLogin(password_form);
 }
 
+void ManagePasswordsBubbleModel::OnChooseCredentials(
+    const autofill::PasswordForm& password_form) {
+  dismissal_reason_ = metrics_util::CLICKED_CREDENTIAL;
+  RecordExperimentStatistics(web_contents(), dismissal_reason_);
+  ManagePasswordsUIController* manage_passwords_ui_controller =
+      ManagePasswordsUIController::FromWebContents(web_contents());
+  manage_passwords_ui_controller->ChooseCredential(true, password_form);
+  state_ = password_manager::ui::INACTIVE_STATE;
+}
+
 // static
 int ManagePasswordsBubbleModel::UsernameFieldWidth() {
   return GetFieldWidth(USERNAME_FIELD);
 }
 
 // static
 int ManagePasswordsBubbleModel::PasswordFieldWidth() {
   return GetFieldWidth(PASSWORD_FIELD);
 }
+
+void InitPasswordsModelFromController(ManagePasswordsUIController* controller,
+                                      ManagePasswordsBubbleModel* model) {

[Mike West, 2014/11/21 11:21:12]

I think I'd prefer to see this live either on the controller or the model, and
to manipulate the other via accessors rather than friending and reaching into
both object's internal state.

[vasilii, 2014/11/21 16:45:37]

Done.

+  model->state_ = controller->state();
+  if (password_manager::ui::IsPendingState(model->state_))
+    model->pending_password_ = controller->PendingPassword();
+  if (model->state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE)
+    model->pending_credentials_.swap(controller->new_password_forms_);
+  else
+    model->best_matches_ = controller->best_matches();
+}