Credential Manager API: Showing both local and federated logins.

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/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/passwords/password_bubble_experiment.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/feedback/feedback_data.h"
 #include "components/feedback/feedback_util.h"
+#include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/password_manager_url_collection_experiment.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/common/password_manager_ui.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using autofill::PasswordFormMap;
 using feedback::FeedbackData;
 using content::WebContents;
@@ skipping 88 matching lines @@
       never_save_passwords_(false),
       display_disposition_(metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
       dismissal_reason_(metrics_util::NOT_DISPLAYED) {
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents);
 
   origin_ = controller->origin();
   state_ = controller->state();
   if (password_manager::ui::IsPendingState(state_))
     pending_password_ = controller->PendingPassword();
-  if (password_manager::ui::IsCredentialsState(state_))
-    pending_credentials_.swap(controller->new_password_forms());
-  else
+  if (password_manager::ui::IsCredentialsState(state_)) {
+    local_pending_credentials_.swap(controller->local_credentials_forms());
+    federated_pending_credentials_.swap(
+        controller->federated_credentials_forms());
+  } else {
     best_matches_ = controller->best_matches();
+  }
 
   if (password_manager::ui::IsPendingState(state_)) {
     title_ = PendingStateTitleBasedOnSavePasswordPref(never_save_passwords_);
   } 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 (password_manager::ui::IsCredentialsState(state_)) {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CHOOSE_TITLE);
@@ skipping 52 matching lines @@
       ManagePasswordsUIController::FromWebContents(web_contents());
   controller->OnBubbleShown();
 }
 
 void ManagePasswordsBubbleModel::OnBubbleHidden() {
   if (password_manager::ui::IsCredentialsState(state_) && web_contents()) {
     // 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());
+    manage_passwords_ui_controller->ChooseCredential(
+        autofill::PasswordForm(),
+        password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
     state_ = password_manager::ui::INACTIVE_STATE;
   }
   if (dismissal_reason_ == metrics_util::NOT_DISPLAYED)
     return;
 
   if (password_manager::ui::IsAskSubmitURLState(state_)) {
     state_ = password_manager::ui::ASK_USER_REPORT_URL_BUBBLE_SHOWN_STATE;
     metrics_util::LogAllowToCollectURLBubbleUIDismissalReason(
         dismissal_reason_);
     // Return since we do not want to include "Allow to collect URL?" bubble
@@ skipping 98 matching lines @@
       PasswordStoreFactory::GetForProfile(
           profile, ServiceAccessType::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) {
+    const autofill::PasswordForm& password_form,
+    password_manager::CredentialType credential_type) {
   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);
+  manage_passwords_ui_controller->ChooseCredential(password_form,
+                                                   credential_type);
   state_ = password_manager::ui::INACTIVE_STATE;
 }
 
 Profile* ManagePasswordsBubbleModel::GetProfile() const {
   return GetProfileFromWebContents(web_contents());
 }
 
 // static
 int ManagePasswordsBubbleModel::UsernameFieldWidth() {
   return GetFieldWidth(USERNAME_FIELD);
 }
 
 // static
 int ManagePasswordsBubbleModel::PasswordFieldWidth() {
   return GetFieldWidth(PASSWORD_FIELD);
 }