Credential Manager API: Showing both local and federated logins.

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.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/views/passwords/manage_passwords_bubble_view.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
@@ skipping 189 matching lines @@
       new views::LabelButton(this, l10n_util::GetStringUTF16(IDS_CANCEL));
   cancel_button_->SetStyle(views::Button::STYLE_BUTTON);
   cancel_button_->SetFontList(
       ui::ResourceBundle::GetSharedInstance().GetFontList(
           ui::ResourceBundle::SmallFont));
 
   // Title row.
   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.
   BuildColumnSet(layout, SINGLE_BUTTON_COLUMN_SET);
   layout->StartRowWithPadding(
       0, SINGLE_BUTTON_COLUMN_SET, 0, views::kRelatedControlVerticalSpacing);
   layout->AddView(cancel_button_);
 
   // Extra padding for visual awesomeness.
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   parent_->set_initially_focused_view(cancel_button_);
 }
 
 ManagePasswordsBubbleView::AccountChooserView::~AccountChooserView() {
 }
 
 void ManagePasswordsBubbleView::AccountChooserView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   if (sender != cancel_button_) {
     // 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();
   }
   parent_->Close();
 }
 
 // ManagePasswordsBubbleView::AskUserToSubmitURLView -------------------------
 
 // Asks users if they want to report the URL when the password manager failed
 // to detect the form. View has following structure:
@@ skipping 720 matching lines @@
 
 void ManagePasswordsBubbleView::NotifyNeverForThisSiteClicked() {
   if (model()->best_matches().empty()) {
     // Skip confirmation if there are no existing passwords for this site.
     NotifyConfirmedNeverForThisSite();
   } else {
     model()->OnConfirmationForNeverForThisSite();
     Refresh();
   }
 }