Index: ui/views/controls/styled_label.cc |
diff --git a/ui/views/controls/styled_label.cc b/ui/views/controls/styled_label.cc |
index d707b6f149f1775b32a37c158139de2524f6f889..24d9862c87ccc30b3ced727b11fafe47e687a783 100644 |
--- a/ui/views/controls/styled_label.cc |
+++ b/ui/views/controls/styled_label.cc |
@@ -97,7 +97,7 @@ StyledLabel::StyledLabel(const base::string16& text, |
: listener_(listener), |
displayed_on_background_color_set_(false), |
auto_color_readability_enabled_(true) { |
- TrimWhitespace(text, TRIM_TRAILING, &text_); |
+ base::TrimWhitespace(text, base::TRIM_TRAILING, &text_); |
} |
StyledLabel::~StyledLabel() {} |
@@ -202,8 +202,10 @@ gfx::Size StyledLabel::CalculateAndDoLayout(int width, bool dry_run) { |
while (!remaining_string.empty()) { |
// Don't put whitespace at beginning of a line with an exception for the |
// first line (so the text's leading whitespace is respected). |
- if (x == 0 && line > 0) |
- TrimWhitespace(remaining_string, TRIM_LEADING, &remaining_string); |
+ if (x == 0 && line > 0) { |
+ base::TrimWhitespace(remaining_string, base::TRIM_LEADING, |
+ &remaining_string); |
+ } |
gfx::Range range(gfx::Range::InvalidRange()); |
if (current_range != style_ranges_.end()) |
@@ -237,7 +239,8 @@ gfx::Size StyledLabel::CalculateAndDoLayout(int width, bool dry_run) { |
// anything; abort. |
if (x == 0) { |
if (line == 0) { |
- TrimWhitespace(remaining_string, TRIM_LEADING, &remaining_string); |
+ base::TrimWhitespace(remaining_string, base::TRIM_LEADING, |
+ &remaining_string); |
continue; |
} |
break; |