diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 16:52:40 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 16:52:40 +0000 |
| commit | 33a968691cf644692428f2b59478479db6376e0e (patch) | |
| tree | 61e5d9967fc7b88efd14c2c54c574d1cd6165b4c /ui | |
| parent | 0472d93e6feea49df59caadb7ab849a9599f916f (diff) | |
| download | chromium_src-33a968691cf644692428f2b59478479db6376e0e.zip chromium_src-33a968691cf644692428f2b59478479db6376e0e.tar.gz chromium_src-33a968691cf644692428f2b59478479db6376e0e.tar.bz2 | |
views: Change TextButton API to string16.
BUG=68267
R=sky@chromium.org
Review URL: http://codereview.chromium.org/8346013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura_shell/examples/widgets.cc | 5 | ||||
| -rw-r--r-- | ui/aura_shell/examples/window_type_launcher.cc | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/ui/aura_shell/examples/widgets.cc b/ui/aura_shell/examples/widgets.cc index 8b032c3..faaf4a3 100644 --- a/ui/aura_shell/examples/widgets.cc +++ b/ui/aura_shell/examples/widgets.cc @@ -52,8 +52,9 @@ class WidgetsWindow : public views::WidgetDelegateView { }; WidgetsWindow::WidgetsWindow() - : button_(new views::NativeTextButton(NULL, L"Button")), - disabled_button_(new views::NativeTextButton(NULL, L"Disabled button")), + : button_(new views::NativeTextButton(NULL, ASCIIToUTF16("Button"))), + disabled_button_( + new views::NativeTextButton(NULL, ASCIIToUTF16("Disabled button"))), checkbox_(new views::Checkbox(ASCIIToUTF16("Checkbox"))), checkbox_disabled_(new views::Checkbox( ASCIIToUTF16("Checkbox disabled"))), diff --git a/ui/aura_shell/examples/window_type_launcher.cc b/ui/aura_shell/examples/window_type_launcher.cc index 63c0278..fdbdb12 100644 --- a/ui/aura_shell/examples/window_type_launcher.cc +++ b/ui/aura_shell/examples/window_type_launcher.cc @@ -33,17 +33,19 @@ void InitWindowTypeLauncher() { } WindowTypeLauncher::WindowTypeLauncher() - : ALLOW_THIS_IN_INITIALIZER_LIST( - create_button_(new views::NativeTextButton(this, L"Create Window"))), - ALLOW_THIS_IN_INITIALIZER_LIST( - create_nonresizable_button_(new views::NativeTextButton( - this, L"Create Non-Resizable Window"))), + : ALLOW_THIS_IN_INITIALIZER_LIST(create_button_( + new views::NativeTextButton(this, ASCIIToUTF16("Create Window")))), + ALLOW_THIS_IN_INITIALIZER_LIST(create_nonresizable_button_( + new views::NativeTextButton( + this, ASCIIToUTF16("Create Non-Resizable Window")))), ALLOW_THIS_IN_INITIALIZER_LIST(bubble_button_( - new views::NativeTextButton(this, L"Create Pointy Bubble"))), + new views::NativeTextButton( + this, ASCIIToUTF16("Create Pointy Bubble")))), ALLOW_THIS_IN_INITIALIZER_LIST(lock_button_( - new views::NativeTextButton(this, L"Lock Screen"))), + new views::NativeTextButton(this, ASCIIToUTF16("Lock Screen")))), ALLOW_THIS_IN_INITIALIZER_LIST(widgets_button_( - new views::NativeTextButton(this, L"Show Example Widgets"))) { + new views::NativeTextButton( + this, ASCIIToUTF16("Show Example Widgets")))) { AddChildView(create_button_); AddChildView(create_nonresizable_button_); AddChildView(bubble_button_); |