| Index: chrome/browser/ui/autofill/autofill_popup_layout_model.cc
|
| diff --git a/chrome/browser/ui/autofill/autofill_popup_layout_model.cc b/chrome/browser/ui/autofill/autofill_popup_layout_model.cc
|
| index 385d472d25dcc03c910ac86ecd1555f3c2568b6d..93dffaaaf6d236199efbc7ff12a6277f640681ab 100644
|
| --- a/chrome/browser/ui/autofill/autofill_popup_layout_model.cc
|
| +++ b/chrome/browser/ui/autofill/autofill_popup_layout_model.cc
|
| @@ -26,6 +26,7 @@
|
| #include "ui/gfx/paint_vector_icon.h"
|
|
|
| #if !defined(OS_ANDROID)
|
| +#include "chrome/app/vector_icons/vector_icons.h"
|
| #include "components/toolbar/vector_icons.h" // nogncheck
|
| #endif
|
|
|
| @@ -121,19 +122,24 @@ int AutofillPopupLayoutModel::GetDesiredPopupWidth() const {
|
| int AutofillPopupLayoutModel::RowWidthWithoutText(int row,
|
| bool with_label) const {
|
| std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
|
| - bool is_warning_message = (suggestions[row].frontend_id ==
|
| - POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE);
|
| + bool is_row_with_right_handside_icon =
|
| + ((suggestions[row].frontend_id ==
|
| + POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE) ||
|
| + (suggestions[row].frontend_id ==
|
| + POPUP_ITEM_ID_ALL_SAVED_PASSWORDS_ENTRY));
|
|
|
| int row_size = kEndPadding;
|
|
|
| if (with_label)
|
| - row_size += is_warning_message ? kHttpWarningNamePadding : kNamePadding;
|
| + row_size += is_row_with_right_handside_icon ? kHttpWarningNamePadding
|
| + : kNamePadding;
|
|
|
| // Add the Autofill icon size, if required.
|
| const base::string16& icon = suggestions[row].icon;
|
| if (!icon.empty()) {
|
| - row_size += GetIconImage(row).width() +
|
| - (is_warning_message ? kHttpWarningIconPadding : kIconPadding);
|
| + row_size += GetIconImage(row).width() + (is_row_with_right_handside_icon
|
| + ? kRightSideIconTextPadding
|
| + : kIconPadding);
|
| }
|
|
|
| // Add the padding at the end.
|
| @@ -180,6 +186,7 @@ const gfx::FontList& AutofillPopupLayoutModel::GetValueFontListForRow(
|
| case POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE:
|
| case POPUP_ITEM_ID_TITLE:
|
| case POPUP_ITEM_ID_PASSWORD_ENTRY:
|
| + case POPUP_ITEM_ID_ALL_SAVED_PASSWORDS_ENTRY:
|
| return normal_font_list_;
|
| case POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY:
|
| case POPUP_ITEM_ID_DATALIST_ENTRY:
|
| @@ -230,6 +237,11 @@ gfx::ImageSkia AutofillPopupLayoutModel::GetIconImage(size_t index) const {
|
| kHttpWarningIconWidth, gfx::kGoogleRed700);
|
| }
|
|
|
| + if (icon_str == base::ASCIIToUTF16("showAllSavedPasswords")) {
|
| + return gfx::CreateVectorIcon(kShowAllSavedPasswordsIcon,
|
| + kHttpWarningIconWidth, gfx::kChromeIconGrey);
|
| + }
|
| +
|
| // For other suggestion entries, get icon from PNG files.
|
| int icon_id = GetIconResourceID(icon_str);
|
| DCHECK_NE(-1, icon_id);
|
|
|