| Index: chrome/browser/ui/views/profiles/profile_chooser_view.cc
|
| diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
|
| index 62702bafaa002d87581ca857030af1a37f487b39..8af320e51d9a69f0e6ca36ed4ae7753e7ec94a5d 100644
|
| --- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc
|
| +++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
|
| @@ -195,6 +195,7 @@ class BackgroundColorHoverButton : public views::LabelButton {
|
| #endif
|
| title_(nullptr),
|
| subtitle_(nullptr) {
|
| + DCHECK(profile_chooser_view);
|
| SetImageLabelSpacing(switches::IsMaterialDesignUserMenu()
|
| ? (kMaterialMenuEdgeMargin - 2)
|
| : views::kItemLabelSpacing);
|
| @@ -2133,9 +2134,8 @@ void ProfileChooserView::CreateAccountButton(views::GridLayout* layout,
|
| int available_width = width - 2 * views::kButtonHEdgeMarginNew -
|
| kDeleteButtonWidth - warning_button_width;
|
| views::LabelButton* email_button = new BackgroundColorHoverButton(
|
| - reauth_required ? this : NULL,
|
| - base::UTF8ToUTF16(email),
|
| - warning_default_image);
|
| + this, base::UTF8ToUTF16(email), warning_default_image);
|
| + email_button->SetEnabled(reauth_required);
|
| email_button->SetElideBehavior(gfx::ELIDE_EMAIL);
|
| email_button->SetMinSize(gfx::Size(0, kButtonHeight));
|
| email_button->SetMaxSize(gfx::Size(available_width, kButtonHeight));
|
|
|