Credential Manager API: Showing both local and federated logins.

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

 // Copyright 2014 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_ui_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
@@ skipping 101 matching lines @@
   origin_ = PendingPassword().origin;
   SetState(password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE);
   timer_.reset(new base::ElapsedTimer());
   UpdateBubbleAndIconVisibility();
 }
 
 bool ManagePasswordsUIController::OnChooseCredentials(
     ScopedVector<autofill::PasswordForm> local_credentials,
     ScopedVector<autofill::PasswordForm> federated_credentials,
     base::Callback<void(const password_manager::CredentialInfo&)> callback){
-  // TODO(vasilii): Do something clever with |federated_credentials|.
   DCHECK(!local_credentials.empty() || !federated_credentials.empty());
   form_manager_.reset();
-  origin_ = local_credentials[0]->origin;
-  new_password_forms_.swap(local_credentials);
+  // TODO(melandory): fix the crash when |local_credentials| is empty.
+  // By providing origin explicitly.
+  if (!local_credentials.empty())
+    origin_ = local_credentials[0]->origin;
+  else
+    origin_ = federated_credentials[0]->origin;

[vasilii, 2015/01/23 17:04:37]

Well, the origin of a federated login isn't what we mean by origin here. That's
why we need to pass it explicitly.
If we suddenly decide to use it in UI, then with the current implementation the
bubble will say "Choose an account for facebook.com" while the user is logging
in to example.com.

[melandory, 2015/01/23 18:16:04]

Yes, I see now. I'll set empty value for it right now and address todo in follow
up cl.

[melandory, 2015/01/26 08:52:47]

https://codereview.chromium.org/877613004

+  local_credentials_forms_.swap(local_credentials);
+  federated_credentials_forms_.swap(federated_credentials);
   // The map is useless because usernames may overlap.
   password_form_map_.clear();
   SetState(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE);
   UpdateBubbleAndIconVisibility();
   if (bubble_shown_)
     credentials_callback_ = callback;
   return bubble_shown_;
 }
 
 void ManagePasswordsUIController::OnAutomaticPasswordSave(
@@ skipping 67 matching lines @@
 }
 
 void ManagePasswordsUIController::SavePassword() {
   DCHECK(PasswordPendingUserDecision());
   SavePasswordInternal();
   SetState(password_manager::ui::MANAGE_STATE);
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::ChooseCredential(
-    bool was_chosen,
-    const autofill::PasswordForm& form) {
+    const autofill::PasswordForm& form,
+    password_manager::CredentialType credential_type) {
   DCHECK(password_manager::ui::IsCredentialsState(state_));
   DCHECK(!credentials_callback_.is_null());
-  password_manager::CredentialInfo info = was_chosen ?
-      password_manager::CredentialInfo(form) :
-      password_manager::CredentialInfo();
+  password_manager::CredentialInfo info =
+      password_manager::CredentialInfo(form, credential_type);
   credentials_callback_.Run(info);
   SetState(password_manager::ui::INACTIVE_STATE);
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::SavePasswordInternal() {
   DCHECK(form_manager_.get());
   form_manager_->Save();
 }
 
@@ skipping 121 matching lines @@
 bool ManagePasswordsUIController::PasswordPendingUserDecision() const {
   return password_manager::ui::IsPendingState(state_);
 }
 
 void ManagePasswordsUIController::WebContentsDestroyed() {
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   if (password_store)
     password_store->RemoveObserver(this);
 }