| Index: views/controls/label.cc
|
| diff --git a/views/controls/label.cc b/views/controls/label.cc
|
| index 80454c342d7bc46351b50743917ffd7ac2dcfa22..627dd98bab7b7be0f2300e4bc769e1b69cb95ab1 100644
|
| --- a/views/controls/label.cc
|
| +++ b/views/controls/label.cc
|
| @@ -141,14 +141,13 @@ const Background* Label::GetMouseOverBackground() const {
|
| void Label::SizeToFit(int max_width) {
|
| DCHECK(is_multi_line_);
|
|
|
| - std::vector<std::wstring> lines;
|
| - base::SplitString(UTF16ToWideHack(text_), L'\n', &lines);
|
| + std::vector<string16> lines;
|
| + base::SplitString(text_, '\n', &lines);
|
|
|
| int label_width = 0;
|
| - for (std::vector<std::wstring>::const_iterator iter = lines.begin();
|
| + for (std::vector<string16>::const_iterator iter = lines.begin();
|
| iter != lines.end(); ++iter) {
|
| - label_width = std::max(label_width,
|
| - font_.GetStringWidth(WideToUTF16Hack(*iter)));
|
| + label_width = std::max(label_width, font_.GetStringWidth(*iter));
|
| }
|
|
|
| label_width += GetInsets().width();
|
|
|