Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Unified Diff: ash/system/user/user_card_view.cc

Issue 614103007: Error in popup on Link (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5a240d891817f81f958ff53e05c58052d7e592c0..ee31983a1756745ebe5ba5a0ff963355ce120efa 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()) {
« no previous file with comments | « no previous file | chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc » ('j') | ui/gfx/canvas_skia.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698