| Index: ui/views/examples/multiline_example.cc
|
| diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc
|
| index 86685a423ec73baf0426e57b5f9cccbfdd23684a..688234e2e09213caa1804908d0b3f7b308b92a16 100644
|
| --- a/ui/views/examples/multiline_example.cc
|
| +++ b/ui/views/examples/multiline_example.cc
|
| @@ -99,14 +99,15 @@ MultilineExample::~MultilineExample() {
|
| }
|
|
|
| void MultilineExample::CreateExampleView(View* container) {
|
| - const char kTestString[] = "test string asdf 1234 test string asdf 1234 "
|
| - "test string asdf 1234 test string asdf 1234";
|
| + const wchar_t kTestString[] = L"qwerty"
|
| + L"\x627\x644\x631\x626\x64A\x633\x64A\x629"
|
| + L"asdfgh";
|
|
|
| render_text_view_ = new RenderTextView();
|
| - render_text_view_->SetText(ASCIIToUTF16(kTestString));
|
| + render_text_view_->SetText(kTestString);
|
|
|
| label_ = new Label();
|
| - label_->SetText(ASCIIToUTF16(kTestString));
|
| + label_->SetText(kTestString);
|
| label_->SetMultiLine(true);
|
| label_->SetBorder(Border::CreateSolidBorder(2, SK_ColorCYAN));
|
|
|
| @@ -117,7 +118,7 @@ void MultilineExample::CreateExampleView(View* container) {
|
|
|
| textfield_ = new Textfield();
|
| textfield_->set_controller(this);
|
| - textfield_->SetText(ASCIIToUTF16(kTestString));
|
| + textfield_->SetText(kTestString);
|
|
|
| GridLayout* layout = new GridLayout(container);
|
| container->SetLayoutManager(layout);
|
|
|