Chromium Code Reviews| 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 e1f40f7308f8a8759e1d5126300b3196ad59b951..813444db47a9266a2fcd2828d3ea1b30c71eba7a 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); |
| @@ -2116,9 +2117,7 @@ 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, |
|
Peter Kasting
2017/02/23 01:35:02
Why were we trying to pass null before? Usually t
jlebel
2017/02/23 18:02:57
You are right, I missed a feature related to this
Peter Kasting
2017/02/24 00:51:19
Will disabling the button cause it to draw differe
|
| - base::UTF8ToUTF16(email), |
| - warning_default_image); |
| + this, base::UTF8ToUTF16(email), warning_default_image); |
| email_button->SetElideBehavior(gfx::ELIDE_EMAIL); |
| email_button->SetMinSize(gfx::Size(0, kButtonHeight)); |
| email_button->SetMaxSize(gfx::Size(available_width, kButtonHeight)); |