Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3341)

Unified Diff: chrome/browser/ui/views/passwords/manage_password_items_view.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 1ad9058f030fd0865c457e33accc57f0833b04f8..080cf6b0e8431dea12c229d505f5fac6988e8d01 100644
--- a/chrome/browser/ui/views/passwords/manage_password_items_view.cc
+++ b/chrome/browser/ui/views/passwords/manage_password_items_view.cc
@@ -66,16 +66,17 @@ void BuildColumnSetIfNeeded(views::GridLayout* layout, int column_set_id) {
}
}
-scoped_ptr<views::Label> GenerateUsernameLabel(
+std::unique_ptr<views::Label> GenerateUsernameLabel(
const autofill::PasswordForm& form) {
- scoped_ptr<views::Label> label(new views::Label(GetDisplayUsername(form)));
+ std::unique_ptr<views::Label> label(
+ new views::Label(GetDisplayUsername(form)));
label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
ui::ResourceBundle::SmallFont));
label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
return label;
}
-scoped_ptr<views::Label> GeneratePasswordLabel(
+std::unique_ptr<views::Label> GeneratePasswordLabel(
const autofill::PasswordForm& form) {
base::string16 text =
form.federation_origin.unique()
@@ -83,7 +84,7 @@ scoped_ptr<views::Label> GeneratePasswordLabel(
: l10n_util::GetStringFUTF16(
IDS_PASSWORDS_VIA_FEDERATION,
base::UTF8ToUTF16(form.federation_origin.host()));
- scoped_ptr<views::Label> label(new views::Label(text));
+ std::unique_ptr<views::Label> label(new views::Label(text));
label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
ui::ResourceBundle::SmallFont));
label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ -92,10 +93,10 @@ scoped_ptr<views::Label> GeneratePasswordLabel(
return label;
}
-scoped_ptr<views::ImageButton> GenerateDeleteButton(
+std::unique_ptr<views::ImageButton> GenerateDeleteButton(
views::ButtonListener* listener) {
ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
- scoped_ptr<views::ImageButton> button(new views::ImageButton(listener));
+ std::unique_ptr<views::ImageButton> button(new views::ImageButton(listener));
button->SetImage(views::ImageButton::STATE_NORMAL,
rb->GetImageNamed(IDR_CLOSE_2).ToImageSkia());
button->SetImage(views::ImageButton::STATE_HOVERED,
@@ -105,8 +106,8 @@ scoped_ptr<views::ImageButton> GenerateDeleteButton(
return button;
}
-scoped_ptr<views::Label> GenerateDeletedPasswordLabel() {
- scoped_ptr<views::Label> text(new views::Label(
+std::unique_ptr<views::Label> GenerateDeletedPasswordLabel() {
+ std::unique_ptr<views::Label> text(new views::Label(
l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETED)));
text->SetHorizontalAlignment(gfx::ALIGN_LEFT);
text->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
@@ -114,9 +115,9 @@ scoped_ptr<views::Label> GenerateDeletedPasswordLabel() {
return text;
}
-scoped_ptr<views::Link> GenerateUndoLink(views::LinkListener* listener) {
- scoped_ptr<views::Link> undo_link(new views::Link(
- l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_UNDO)));
+std::unique_ptr<views::Link> GenerateUndoLink(views::LinkListener* listener) {
+ std::unique_ptr<views::Link> undo_link(
+ new views::Link(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_UNDO)));
undo_link->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
undo_link->set_listener(listener);
undo_link->SetUnderline(false);
@@ -191,9 +192,10 @@ int ManagePasswordItemsView::PasswordFormRow::GetFixedHeight(
password_manager::ui::State state) {
if (state != password_manager::ui::MANAGE_STATE)
return 0;
- scoped_ptr<views::ImageButton> delete_button(GenerateDeleteButton(nullptr));
- scoped_ptr<views::Link> link(GenerateUndoLink(nullptr));
- scoped_ptr<views::Label> label(GenerateDeletedPasswordLabel());
+ std::unique_ptr<views::ImageButton> delete_button(
+ GenerateDeleteButton(nullptr));
+ std::unique_ptr<views::Link> link(GenerateUndoLink(nullptr));
+ std::unique_ptr<views::Label> label(GenerateDeletedPasswordLabel());
views::View* row_views[] = {delete_button.get(), link.get(), label.get()};
return std::accumulate(row_views, row_views + arraysize(row_views), 0,
[](int max_height, const views::View* view) {
@@ -227,8 +229,8 @@ void ManagePasswordItemsView::PasswordFormRow::AddCredentialsRow(
void ManagePasswordItemsView::PasswordFormRow::AddUndoRow(
views::GridLayout* layout) {
ResetControls();
- scoped_ptr<views::Label> text = GenerateDeletedPasswordLabel();
- scoped_ptr<views::Link> undo_link = GenerateUndoLink(this);
+ std::unique_ptr<views::Label> text = GenerateDeletedPasswordLabel();
+ std::unique_ptr<views::Link> undo_link = GenerateUndoLink(this);
undo_link_ = undo_link.get();
BuildColumnSetIfNeeded(layout, TWO_COLUMN_SET);
layout->StartRow(0, TWO_COLUMN_SET);

Powered by Google App Engine
This is Rietveld 408576698