| Index: ash/system/user/user_card_view.cc
|
| diff --git a/ash/system/user/user_card_view.cc b/ash/system/user/user_card_view.cc
|
| index 5f46e2a1969354d1994d564e2861646f94964c50..3840f53017fb3ff6277dd390010007075bdfc5a6 100644
|
| --- a/ash/system/user/user_card_view.cc
|
| +++ b/ash/system/user/user_card_view.cc
|
| @@ -202,7 +202,8 @@ void PublicAccountUserDetails::Layout() {
|
| contents_area.width(),
|
| contents_area.height(),
|
| gfx::ELIDE_LONG_WORDS,
|
| - &lines);
|
| + &lines,
|
| + nullptr);
|
| // Loop through the lines, creating a renderer for each.
|
| gfx::Point position = contents_area.origin();
|
| gfx::Range display_name(gfx::Range::InvalidRange());
|
| @@ -303,7 +304,8 @@ void PublicAccountUserDetails::CalculatePreferredSize(int max_allowed_width) {
|
| width,
|
| INT_MAX,
|
| gfx::TRUNCATE_LONG_WORDS,
|
| - &lines) != 0;
|
| + &lines,
|
| + nullptr) != 0;
|
| int line_count = lines.size();
|
| if (!too_narrow && line_count == 3 &&
|
| width - gfx::GetStringWidth(lines.back(), font_list) <=
|
| @@ -317,8 +319,13 @@ void PublicAccountUserDetails::CalculatePreferredSize(int max_allowed_width) {
|
|
|
| // Calculate the corresponding height and set the preferred size.
|
| lines.clear();
|
| - gfx::ElideRectangleText(
|
| - text_, font_list, min_width, INT_MAX, gfx::TRUNCATE_LONG_WORDS, &lines);
|
| + gfx::ElideRectangleText(text_,
|
| + font_list,
|
| + min_width,
|
| + INT_MAX,
|
| + gfx::TRUNCATE_LONG_WORDS,
|
| + &lines,
|
| + nullptr);
|
| int line_count = lines.size();
|
| if (min_width - gfx::GetStringWidth(lines.back(), font_list) <=
|
| space_width + link_size.width()) {
|
|
|