Credential Manager API: Showing both local and federated logins.

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

Index: chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
index 8da3ab47bd39194b7c2c3eb122ae500284dc6021..f4536e981b6c4741b2e6a99696ea9dcc43a306fa 100644
--- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
+++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
@@ -207,12 +207,24 @@ ManagePasswordsBubbleView::AccountChooserView::AccountChooserView(
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   AddTitleRow(layout, parent_->model());
 
-  const auto& pending_credentials = parent_->model()->pending_credentials();
-  for (autofill::PasswordForm* form : pending_credentials) {
-    CredentialsItemView* credential_view = new CredentialsItemView(this, *form);
+  auto add_credential_item_with_state =
+      [&layout, this](const autofill::PasswordForm& form,
+                      password_manager::CredentialType type) {

[vasilii, 2015/01/13 18:13:28]

It will be shorter to write a method taking a vector and type.

[melandory, 2015/01/16 12:53:20]

I've changed lambda code, now it has vector as an argument and iterates over it.
Do you think that function in anonym namespace is better?

     // Add the title to the layout with appropriate padding.
     layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
-    layout->AddView(credential_view);
+    layout->AddView(new CredentialsItemView(this, form, type));
+  };
+
+  for (autofill::PasswordForm* form :
+       parent_->model()->local_pending_credentials()) {
+    add_credential_item_with_state(
+        *form, password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL);
+  }
+
+  for (autofill::PasswordForm* form :
+       parent_->model()->federated_pending_credentials()) {
+    add_credential_item_with_state(
+        *form, password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED);
   }
 
   // Button row.
@@ -236,7 +248,8 @@ void ManagePasswordsBubbleView::AccountChooserView::ButtonPressed(
     // ManagePasswordsBubbleModel should care about calling a callback in case
     // the bubble is dismissed by any other means.
     CredentialsItemView* view = static_cast<CredentialsItemView*>(sender);
-    parent_->model()->OnChooseCredentials(view->form());
+    parent_->model()->OnChooseCredentials(view->form(),
+                                          view->credential_type());
   } else {
     parent_->model()->OnNopeClicked();
   }