Change the account chooser on Win to look like in the mocks.

BUG=550922

Review URL: https://codereview.chromium.org/1701363002

Cr-Commit-Position: refs/heads/master@{#376130}

chrome/browser/ui/cocoa/passwords/account_chooser_view_controller.mm

@@ -24,8 +24,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/strings/grit/ui_strings.h"
 
-const SkColor kButtonHoverColor = SkColorSetRGB(0xEA, 0xEA, 0xEA);
-
 @interface AccountChooserViewController () {
   NSButton* cancelButton_;  // Weak.
   NSTextView* titleView_;   //  Weak.

chrome/browser/ui/passwords/password_dialog_prompts.h

@@ -22,6 +22,9 @@ const int kTitleTopInset = 12;
 // The color of the content in the autosign-in first run prompt.
 const SkColor kAutoSigninTextColor = SkColorSetRGB(0x64, 0x64, 0x64);
 
+// The hover color of the account chooser.
+const SkColor kButtonHoverColor = SkColorSetRGB(0xEA, 0xEA, 0xEA);
+
 // A platform-independent interface for the account chooser dialog.
 class AccountChooserPrompt {
  public:

chrome/browser/ui/views/passwords/account_chooser_dialog_view.cc

@@ -23,22 +23,28 @@
 
 namespace {
 
+const int kVerticalAvatarMargin = 8;
+
 // An identifier for views::ColumnSet.
 enum ColumnSetType {
   SINGLE_VIEW_COLUMN_SET,
+  SINGLE_VIEW_COLUMN_SET_NO_PADDING,
 };
 
-// Construct a SINGLE_VIEW_COLUMN_SET ColumnSet and add it to |layout|.
-void BuildOneColumnSet(views::GridLayout* layout) {
-  views::ColumnSet* column_set = layout->AddColumnSet(SINGLE_VIEW_COLUMN_SET);
-  column_set->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
+// Construct a |type| ColumnSet and add it to |layout|.
+void BuildColumnSet(ColumnSetType type, views::GridLayout* layout) {
+  views::ColumnSet* column_set = layout->AddColumnSet(type);
+  bool padding = (type == SINGLE_VIEW_COLUMN_SET);
+  if (padding)
+    column_set->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
-  column_set->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
+  if (padding)
+    column_set->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
 }
 
 views::StyledLabel::RangeStyleInfo GetLinkStyle() {
@@ -120,14 +126,15 @@ void AccountChooserDialogView::StyledLabelLinkClicked(views::StyledLabel* label,
 void AccountChooserDialogView::ButtonPressed(views::Button* sender,
                                              const ui::Event& event) {
   CredentialsItemView* view = static_cast<CredentialsItemView*>(sender);
-  controller_->OnChooseCredentials(*view->form(),
-                                   view->credential_type());
+  controller_->OnChooseCredentials(
+      *view->form(),
+      password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
 }
 
 void AccountChooserDialogView::InitWindow() {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
-  BuildOneColumnSet(layout);
+  BuildColumnSet(SINGLE_VIEW_COLUMN_SET, layout);
 
   // Create the title.
   std::pair<base::string16, gfx::Range> title_content =
@@ -147,6 +154,7 @@ void AccountChooserDialogView::InitWindow() {
   // Show credentials.
   net::URLRequestContextGetter* request_context =
       GetProfileFromWebContents(web_contents_)->GetRequestContext();
+  BuildColumnSet(SINGLE_VIEW_COLUMN_SET_NO_PADDING, layout);
   for (const auto& form : controller_->GetLocalForms()) {
     const base::string16& upper_string =
         form->display_name.empty() ? form->username_value : form->display_name;
@@ -159,11 +167,15 @@ void AccountChooserDialogView::InitWindow() {
           IDS_PASSWORDS_VIA_FEDERATION,
           base::UTF8ToUTF16(form->federation_url.host()));
     }
-    layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
-    layout->AddView(new CredentialsItemView(
-        this, form.get(),
-        password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD,
-        upper_string, lower_string, request_context));
+    layout->StartRow(0, SINGLE_VIEW_COLUMN_SET_NO_PADDING);
+    CredentialsItemView* view = new CredentialsItemView(
+        this, upper_string, lower_string, kButtonHoverColor,
+        form.get(), request_context);
+    view->SetLowerLabelColor(kAutoSigninTextColor);
+    view->SetBorder(views::Border::CreateEmptyBorder(
+        kVerticalAvatarMargin, views::kButtonHEdgeMarginNew,
+        kVerticalAvatarMargin, views::kButtonHEdgeMarginNew));
+    layout->AddView(view);
   }
   // DialogClientView adds kRelatedControlVerticalSpacing padding once more for
   // the buttons.

chrome/browser/ui/views/passwords/credentials_item_view.cc

@@ -18,10 +18,11 @@
 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/layout/layout_constants.h"
 
 namespace {
 // The default spacing between the icon and text.
-const int kSpacing = 5;
+const int kSpacing = 12;
 
 gfx::Size GetTextLabelsSize(const views::Label* upper_label,
                             const views::Label* lower_label) {
@@ -60,16 +61,16 @@ void CircularImageView::OnPaint(gfx::Canvas* canvas) {
 
 CredentialsItemView::CredentialsItemView(
     views::ButtonListener* button_listener,
-    const autofill::PasswordForm* form,
-    password_manager::CredentialType credential_type,
     const base::string16& upper_text,
     const base::string16& lower_text,
+    SkColor hover_color,
+    const autofill::PasswordForm* form,
     net::URLRequestContextGetter* request_context)
     : LabelButton(button_listener, base::string16()),
       form_(form),
-      credential_type_(credential_type),
       upper_label_(nullptr),
       lower_label_(nullptr),
+      hover_color_(hover_color),
       weak_ptr_factory_(this) {
   set_notify_enter_exit_on_child(true);
   // Create an image-view for the avatar. Make sure it ignores events so that
@@ -92,7 +93,7 @@ CredentialsItemView::CredentialsItemView(
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   if (!upper_text.empty()) {
     upper_label_ = new views::Label(
-        upper_text, rb->GetFontList(ui::ResourceBundle::BoldFont));
+        upper_text, rb->GetFontList(ui::ResourceBundle::SmallFont));
     upper_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(upper_label_);
   }
@@ -109,6 +110,19 @@ CredentialsItemView::CredentialsItemView(
 
 CredentialsItemView::~CredentialsItemView() = default;
 
+void CredentialsItemView::UpdateAvatar(const gfx::ImageSkia& image) {
+  image_view_->SetImage(ScaleImageForAccountAvatar(image));
+}
+
+void CredentialsItemView::SetLowerLabelColor(SkColor color) {
+  if (lower_label_)
+    lower_label_->SetEnabledColor(color);
+}
+
+void CredentialsItemView::SetHoverColor(SkColor color) {
+  hover_color_ = color;
+}
+
 gfx::Size CredentialsItemView::GetPreferredSize() const {
   gfx::Size labels_size = GetTextLabelsSize(upper_label_, lower_label_);
   gfx::Size size = gfx::Size(kAvatarImageSize + labels_size.width(),
@@ -152,6 +166,9 @@ void CredentialsItemView::Layout() {
   }
 }
 
-void CredentialsItemView::UpdateAvatar(const gfx::ImageSkia& image) {
-  image_view_->SetImage(ScaleImageForAccountAvatar(image));
+void CredentialsItemView::OnPaint(gfx::Canvas* canvas) {
+  if (state() == STATE_PRESSED || state() == STATE_HOVERED)
+    canvas->DrawColor(hover_color_);
+
+  LabelButton::OnPaint(canvas);
 }

chrome/browser/ui/views/passwords/credentials_item_view.h

@@ -8,7 +8,6 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/passwords/account_avatar_fetcher.h"
-#include "components/password_manager/core/common/credential_manager_types.h"
 #include "ui/views/controls/button/label_button.h"
 
 namespace autofill {
@@ -34,34 +33,36 @@ class CredentialsItemView : public AccountAvatarFetcherDelegate,
                             public views::LabelButton {
  public:
   CredentialsItemView(views::ButtonListener* button_listener,
-                      const autofill::PasswordForm* form,
-                      password_manager::CredentialType credential_type,
                       const base::string16& upper_text,
                       const base::string16& lower_text,
+                      SkColor hover_color,
+                      const autofill::PasswordForm* form,
                       net::URLRequestContextGetter* request_context);
   ~CredentialsItemView() override;
 
   const autofill::PasswordForm* form() const { return form_; }
-  password_manager::CredentialType credential_type() const {
-    return credential_type_;
-  }
 
   // AccountAvatarFetcherDelegate:
   void UpdateAvatar(const gfx::ImageSkia& image) override;
 
+  void SetLowerLabelColor(SkColor color);
+  void SetHoverColor(SkColor color);
+
  private:
   // views::LabelButton:
   gfx::Size GetPreferredSize() const override;
   int GetHeightForWidth(int w) const override;
   void Layout() override;
+  void OnPaint(gfx::Canvas* canvas) override;
 
   const autofill::PasswordForm* form_;
-  const password_manager::CredentialType credential_type_;
 
   views::ImageView* image_view_;
   views::Label* upper_label_;
   views::Label* lower_label_;
 
+  SkColor hover_color_;
+
   base::WeakPtrFactory<CredentialsItemView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CredentialsItemView);

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

@@ -224,11 +224,13 @@ ManagePasswordsBubbleView::AutoSigninView::AutoSigninView(
   SetLayoutManager(new views::FillLayout);
   const autofill::PasswordForm& form = parent_->model()->pending_password();
   CredentialsItemView* credential = new CredentialsItemView(
-      this, &form,
-      password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD,
+      this,
       base::string16(),
       l10n_util::GetStringFUTF16(IDS_MANAGE_PASSWORDS_AUTO_SIGNIN_TITLE,
                                  form.username_value),
+      GetNativeTheme()->GetSystemColor(
+          ui::NativeTheme::kColorId_ButtonBackgroundColor),
+      &form,
       parent_->model()->GetProfile()->GetRequestContext());
   credential->SetEnabled(false);
   AddChildView(credential);