Commit e8d91bdd authored by treib's avatar treib Committed by Commit bot

Supervised users: Properly display long custodian emails in the disclaimer.

This CL allows the disclaimer label to break within words, so that long emails will appear fully, rather than being cut off/elided.

BUG=406359

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

Cr-Commit-Position: refs/heads/master@{#291702}
parent 28e16123
...@@ -757,6 +757,7 @@ void AvatarMenuBubbleView::InitSupervisedUserContents( ...@@ -757,6 +757,7 @@ void AvatarMenuBubbleView::InitSupervisedUserContents(
ui::ResourceBundle::GetSharedInstance().GetFontList( ui::ResourceBundle::GetSharedInstance().GetFontList(
ui::ResourceBundle::SmallFont)); ui::ResourceBundle::SmallFont));
supervised_user_info_->SetMultiLine(true); supervised_user_info_->SetMultiLine(true);
supervised_user_info_->SetAllowCharacterBreak(true);
supervised_user_info_->SetHorizontalAlignment(gfx::ALIGN_LEFT); supervised_user_info_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
supervised_user_info_->SetBackgroundColor(color()); supervised_user_info_->SetBackgroundColor(color());
AddChildView(supervised_user_info_); AddChildView(supervised_user_info_);
......
...@@ -1294,6 +1294,7 @@ views::View* ProfileChooserView::CreateSupervisedUserDisclaimerView() { ...@@ -1294,6 +1294,7 @@ views::View* ProfileChooserView::CreateSupervisedUserDisclaimerView() {
views::Label* disclaimer = new views::Label( views::Label* disclaimer = new views::Label(
avatar_menu_->GetSupervisedUserInformation()); avatar_menu_->GetSupervisedUserInformation());
disclaimer->SetMultiLine(true); disclaimer->SetMultiLine(true);
disclaimer->SetAllowCharacterBreak(true);
disclaimer->SetHorizontalAlignment(gfx::ALIGN_LEFT); disclaimer->SetHorizontalAlignment(gfx::ALIGN_LEFT);
ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
disclaimer->SetFontList(rb->GetFontList(ui::ResourceBundle::SmallFont)); disclaimer->SetFontList(rb->GetFontList(ui::ResourceBundle::SmallFont));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment