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 /views/window | |
| 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 'views/window')
| -rw-r--r-- | views/window/dialog_client_view.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index 4c571c2..9a75fe2 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -70,7 +70,7 @@ class DialogButton : public NativeTextButton { DialogButton(ButtonListener* listener, Widget* owner, MessageBoxFlags::DialogButton type, - const std::wstring& title, + const string16& title, bool is_default) : NativeTextButton(listener, title), owner_(owner), @@ -135,9 +135,10 @@ void DialogClientView::ShowDialogButtons() { label = l10n_util::GetStringUTF16(IDS_APP_OK); bool is_default_button = (dd->GetDefaultDialogButton() & MessageBoxFlags::DIALOGBUTTON_OK) != 0; - ok_button_ = new DialogButton(this, GetWidget(), + ok_button_ = new DialogButton(this, + GetWidget(), MessageBoxFlags::DIALOGBUTTON_OK, - UTF16ToWideHack(label), + label, is_default_button); ok_button_->SetGroup(kButtonGroup); if (is_default_button) @@ -160,9 +161,10 @@ void DialogClientView::ShowDialogButtons() { bool is_default_button = (dd->GetDefaultDialogButton() & MessageBoxFlags::DIALOGBUTTON_CANCEL) != 0; - cancel_button_ = new DialogButton(this, GetWidget(), + cancel_button_ = new DialogButton(this, + GetWidget(), MessageBoxFlags::DIALOGBUTTON_CANCEL, - UTF16ToWideHack(label), + label, is_default_button); cancel_button_->SetGroup(kButtonGroup); cancel_button_->AddAccelerator(Accelerator(ui::VKEY_ESCAPE, |