Integrate ManagePasswordsState into ManagePasswordsUIController.

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 "base/timer/timer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 145 matching lines @@
   explicit AccountChooserView(ManagePasswordsBubbleView* parent);
   ~AccountChooserView() override;
 
  private:
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // Adds |password_forms| to the layout remembering their |type|.
   void AddCredentialItemsWithType(
       views::GridLayout* layout,
-      const ScopedVector<autofill::PasswordForm>& password_forms,
+      const ScopedVector<const autofill::PasswordForm>& password_forms,
       password_manager::CredentialType type);
 
   ManagePasswordsBubbleView* parent_;
   views::LabelButton* cancel_button_;
 };
 
 ManagePasswordsBubbleView::AccountChooserView::AccountChooserView(
     ManagePasswordsBubbleView* parent)
     : parent_(parent) {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   cancel_button_ =
       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());
 
   AddCredentialItemsWithType(
-      layout, parent_->model()->local_pending_credentials(),
+      layout, parent_->model()->local_credentials(),
       password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL);
 
   AddCredentialItemsWithType(
-      layout, parent_->model()->federated_pending_credentials(),
+      layout, parent_->model()->federated_credentials(),
       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::AddCredentialItemsWithType(
     views::GridLayout* layout,
-    const ScopedVector<autofill::PasswordForm>& password_forms,
+    const ScopedVector<const autofill::PasswordForm>& password_forms,
     password_manager::CredentialType type) {
   net::URLRequestContextGetter* request_context =
       parent_->model()->GetProfile()->GetRequestContext();
-  for (autofill::PasswordForm* form : password_forms) {
+  for (const autofill::PasswordForm* form : password_forms) {
     // Add the title to the layout with appropriate padding.
     layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
     layout->AddView(new CredentialsItemView(
         this, form, type, CredentialsItemView::ACCOUNT_CHOOSER,
         request_context));
   }
 }
 
 void ManagePasswordsBubbleView::AccountChooserView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
@@ skipping 274 matching lines @@
   layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
   SetLayoutManager(layout);
 
   // Add the title.
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   AddTitleRow(layout, parent_->model());
 
   // If we have a list of passwords to store for the current site, display
   // them to the user for management. Otherwise, render a "No passwords for
   // this site" message.
-  if (!parent_->model()->best_matches().empty()) {
-    std::vector<const autofill::PasswordForm*> password_forms;
-    for (auto password_form : parent_->model()->best_matches()) {
-      password_forms.push_back(password_form.second);
-    }
+  if (!parent_->model()->local_credentials().empty()) {
     ManagePasswordItemsView* item = new ManagePasswordItemsView(
-        parent_->model(), password_forms);
+        parent_->model(), parent_->model()->local_credentials().get());
     layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
     layout->AddView(item);
   } else {
     views::Label* empty_label = new views::Label(
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_NO_PASSWORDS));
     empty_label->SetMultiLine(true);
     empty_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     empty_label->SetFontList(
         ui::ResourceBundle::GetSharedInstance().GetFontList(
             ui::ResourceBundle::SmallFont));
@@ skipping 75 matching lines @@
     ManagePasswordsBubbleView* parent)
     : parent_(parent) {
   views::GridLayout* layout = new views::GridLayout(this);
   layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
   SetLayoutManager(layout);
 
   // Add the title.
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   AddTitleRow(layout, parent_->model());
 
-  if (!parent_->model()->local_pending_credentials().empty()) {
+  if (!parent_->model()->local_credentials().empty()) {
     for (const autofill::PasswordForm* form :
-        parent_->model()->local_pending_credentials()) {
+         parent_->model()->local_credentials()) {
       layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
       layout->AddView(new ManageCredentialItemView(parent_->model(), form));
     }
   } else {
     views::Label* empty_label = new views::Label(
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_NO_PASSWORDS),
         ui::ResourceBundle::GetSharedInstance().GetFontList(
             ui::ResourceBundle::SmallFont));
     empty_label->SetMultiLine(true);
     empty_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ skipping 381 matching lines @@
   model()->OnNeverForThisSiteClicked();
   Close();
 }
 
 void ManagePasswordsBubbleView::NotifyUndoNeverForThisSite() {
   model()->OnUndoNeverForThisSite();
   Refresh();
 }
 
 void ManagePasswordsBubbleView::NotifyNeverForThisSiteClicked() {
-  if (model()->best_matches().empty()) {
+  if (model()->local_credentials().empty()) {
     // Skip confirmation if there are no existing passwords for this site.
     NotifyConfirmedNeverForThisSite();
   } else {
     model()->OnConfirmationForNeverForThisSite();
     Refresh();
   }
 }