Chromium Code Reviews| Index: ash/common/system/user/user_card_view.cc |
| diff --git a/ash/common/system/user/user_card_view.cc b/ash/common/system/user/user_card_view.cc |
| index 385c598c75f1282731b34569406a49648fc32ac3..18f294eaa1cdd079a1754a5d6f7edd512d97fd4d 100644 |
| --- a/ash/common/system/user/user_card_view.cc |
| +++ b/ash/common/system/user/user_card_view.cc |
| @@ -503,8 +503,8 @@ void UserCardView::AddUserContentMd(LoginStatus login_status) { |
| if (!user_name_string.empty()) { |
| user_name = new views::Label(user_name_string); |
| user_name->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
| - TrayPopupItemStyle user_name_style(nullptr, |
| - TrayPopupItemStyle::FontStyle::TITLE); |
| + TrayPopupItemStyle user_name_style( |
| + nullptr, TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL); |
|
tdanderson
2016/11/28 20:55:30
nit: Use the single-parameter TPIS constructor.
Evan Stade
2016/11/29 02:30:32
Done.
|
| user_name_style.SetupLabel(user_name); |
| } |
| } |
| @@ -519,9 +519,6 @@ void UserCardView::AddUserContentMd(LoginStatus login_status) { |
| delegate->GetUserInfo(user_index_)->GetDisplayEmail()); |
| if (!user_email_string.empty()) { |
| user_email = new views::Label(user_email_string); |
| - user_email->SetFontList( |
| - ui::ResourceBundle::GetSharedInstance().GetFontList( |
| - ui::ResourceBundle::SmallFont)); |
| user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
| TrayPopupItemStyle user_email_style( |
| nullptr, TrayPopupItemStyle::FontStyle::CAPTION); |