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

Unified Diff: ui/views/controls/label.cc

Issue 1278973003: Revert of Update SplitString calls to new form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « ui/gl/gl_implementation.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/label.cc
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index 43dafe649e284f35b120ab103e40be2ff39cb952..766452012697dfbbc3b33dd05e44a9f772c15488 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -496,9 +496,7 @@
// |width| can be 0 when getting the default text size, in that case
// the ideal lines (i.e. broken at newline characters) are wanted.
if (width <= 0) {
- lines = base::SplitString(
- render_text_->GetDisplayText(), base::string16(1, '\n'),
- base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+ base::SplitString(render_text_->GetDisplayText(), '\n', &lines);
} else {
gfx::ElideRectangleText(render_text_->GetDisplayText(), font_list(), width,
std::numeric_limits<int>::max(),
« no previous file with comments | « ui/gl/gl_implementation.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698