Chromium Code Reviews| Index: chrome/browser/ui/views/passwords/manage_password_items_view.cc |
| diff --git a/chrome/browser/ui/views/passwords/manage_password_items_view.cc b/chrome/browser/ui/views/passwords/manage_password_items_view.cc |
| index 97cae00a0e457b8b9bac5f2ec054e427bfa7dbef..80a1cc325570bd303cdebb10d5fe60f683a81384 100644 |
| --- a/chrome/browser/ui/views/passwords/manage_password_items_view.cc |
| +++ b/chrome/browser/ui/views/passwords/manage_password_items_view.cc |
| @@ -7,6 +7,7 @@ |
| #include <numeric> |
| #include "base/macros.h" |
| +#include "base/memory/ptr_util.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" |
| #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h" |
| @@ -267,23 +268,32 @@ void ManagePasswordItemsView::PasswordFormRow::ResetControls() { |
| // ManagePasswordItemsView |
| ManagePasswordItemsView::ManagePasswordItemsView( |
| ManagePasswordsBubbleModel* manage_passwords_bubble_model, |
| - const std::vector<const autofill::PasswordForm*>& password_forms) |
| + const std::vector<autofill::PasswordForm>* password_forms) |
| : model_(manage_passwords_bubble_model) { |
| int fixed_height = PasswordFormRow::GetFixedHeight(model_->state()); |
| - for (const autofill::PasswordForm* password_form : password_forms) { |
| - if (!password_form->is_public_suffix_match) |
| - password_forms_rows_.push_back( |
| - new PasswordFormRow(this, password_form, fixed_height)); |
| + for (const auto& password_form : *password_forms) { |
| + if (!password_form.is_public_suffix_match) |
| + password_forms_rows_.push_back(base::WrapUnique( |
|
vabr (Chromium)
2016/08/18 18:39:19
Also here: what about MakeUnique or emplace_back?
vasilii
2016/08/19 09:52:30
Done.
|
| + new PasswordFormRow(this, &password_form, fixed_height))); |
| } |
| AddRows(); |
| } |
| +ManagePasswordItemsView::ManagePasswordItemsView( |
| + ManagePasswordsBubbleModel* manage_passwords_bubble_model, |
| + const autofill::PasswordForm* password_form) |
| + : model_(manage_passwords_bubble_model) { |
| + password_forms_rows_.push_back( |
| + base::WrapUnique(new PasswordFormRow(this, password_form, 0))); |
| + AddRows(); |
| +} |
| + |
| ManagePasswordItemsView::~ManagePasswordItemsView() = default; |
| void ManagePasswordItemsView::AddRows() { |
| views::GridLayout* layout = new views::GridLayout(this); |
| SetLayoutManager(layout); |
| - for (auto* row : password_forms_rows_) { |
| + for (const std::unique_ptr<PasswordFormRow>& row : password_forms_rows_) { |
| if (row != password_forms_rows_[0]) |
| layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); |
| row->AddRow(layout); |