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 0095032732fd4758a246bf85caef5ae57cbc68a9..03e591be88deb1c022e1ab0709dc2e200816b742 100644 |
--- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc |
+++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc |
@@ -1027,9 +1027,8 @@ ManagePasswordsBubbleView::UpdatePendingView::UpdatePendingView( |
parent->model()->pending_password().username_value); |
item = selection_view_; |
} else { |
- DCHECK_EQ(1u, parent->model()->local_credentials().size()); |
- DCHECK_EQ(parent->model()->local_credentials()[0]->username_value, |
- parent->model()->pending_password().username_value); |
+ // |pending_password()| is a form that should be updated, so it should be |
+ // used when the user clicks "Update". |
std::vector<const autofill::PasswordForm*> forms; |
forms.push_back(&parent->model()->pending_password()); |
item = new ManagePasswordItemsView(parent_->model(), forms); |
@@ -1091,9 +1090,10 @@ void ManagePasswordsBubbleView::UpdatePendingView::ButtonPressed( |
parent_->model()->OnUpdateClicked( |
*selection_view_->GetSelectedCredentials()); |
} else { |
- parent_->model()->OnUpdateClicked( |
- *parent_->model()->local_credentials()[0]); |
+ parent_->model()->OnUpdateClicked(parent_->model()->pending_password()); |
} |
+ } else { |
+ parent_->model()->OnNopeUpdateClicked(); |
} |
parent_->Close(); |
} |