Password bubble: Keep the bubble in sync with the password store.

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/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 302 matching lines @@
     layout->AddView(refuse_combobox_);
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   } else {
     // 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.
     //
     // TODO(mkwst): Do we really want the "No passwords" case? It would probably
     // be better to only clear the pending password upon navigation, rather than
     // as soon as the bubble closes.
-    int num_items_displayed = 0;
     if (!manage_passwords_bubble_model_->best_matches().empty()) {
       for (autofill::PasswordFormMap::const_iterator i(
                manage_passwords_bubble_model_->best_matches().begin());
            i != manage_passwords_bubble_model_->best_matches().end(); ++i) {
         ManagePasswordItemView* item = new ManagePasswordItemView(
             manage_passwords_bubble_model_,
             *i->second,
             first_field_width,
             second_field_width,
-            num_items_displayed == 0 ? ManagePasswordItemView::FIRST_ITEM
-                                     : ManagePasswordItemView::SUBSEQUENT_ITEM);
+            i == manage_passwords_bubble_model_->best_matches().begin()
+                ? ManagePasswordItemView::FIRST_ITEM
+                : ManagePasswordItemView::SUBSEQUENT_ITEM);
 
         layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
         layout->AddView(item);
-        num_items_displayed++;
       }
-    } else if (!manage_passwords_bubble_model_->password_submitted()) {
+    } else {
         views::Label* empty_label = new views::Label(
             l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_NO_PASSWORDS));
         empty_label->SetMultiLine(true);
 
         layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
         layout->AddView(empty_label);
     }
 
-    // If the user just saved a password, it won't be in the 'best matches' list
-    // we just walked through. Display it explicitly.
-    if (manage_passwords_bubble_model_->password_submitted()) {
-      ManagePasswordItemView* item = new ManagePasswordItemView(
-          manage_passwords_bubble_model_,
-          manage_passwords_bubble_model_->pending_credentials(),
-          first_field_width,
-          second_field_width,
-          num_items_displayed ? ManagePasswordItemView::FIRST_ITEM
-                              : ManagePasswordItemView::SUBSEQUENT_ITEM);
-
-      layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
-      layout->AddView(item);
-      num_items_displayed++;
-    }
-
     // Build a "manage" link and "done" button, and throw them both into a new
     // row
     // containing a double-view columnset.
     manage_link_ =
         new views::Link(manage_passwords_bubble_model_->manage_link());
     manage_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     manage_link_->SetUnderline(false);
     manage_link_->set_listener(this);
 
     done_button_ =
@@ skipping 46 matching lines @@
     case SavePasswordRefusalComboboxModel::INDEX_NEVER_FOR_THIS_SITE:
       manage_passwords_bubble_model_->OnNeverForThisSiteClicked();
       reason = CLICKED_NEVER;
       break;
     default:
       NOTREACHED();
       break;
   }
   Close(reason);
 }