summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/user_data_dir_dialog.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 00:21:51 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 00:21:51 +0000
commitfee565773acff331a7ef40f0c30d3fb6f05c3c9c (patch)
tree6e7f0828e12daaa74885ebac14fac6197462aadd /chrome/browser/ui/views/user_data_dir_dialog.cc
parenta980002843fab42a1755c16285d3cb06ad6be38b (diff)
downloadchromium_src-fee565773acff331a7ef40f0c30d3fb6f05c3c9c.zip
chromium_src-fee565773acff331a7ef40f0c30d3fb6f05c3c9c.tar.gz
chromium_src-fee565773acff331a7ef40f0c30d3fb6f05c3c9c.tar.bz2
views: Change DialogDelegate::GetDialogButtonLabel() to string16.
BUG=68267 R=sky@chromium.org Review URL: http://codereview.chromium.org/8176012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/user_data_dir_dialog.cc')
-rw-r--r--chrome/browser/ui/views/user_data_dir_dialog.cc14
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/ui/views/user_data_dir_dialog.cc b/chrome/browser/ui/views/user_data_dir_dialog.cc
index 891635b..2996de9 100644
--- a/chrome/browser/ui/views/user_data_dir_dialog.cc
+++ b/chrome/browser/ui/views/user_data_dir_dialog.cc
@@ -40,21 +40,19 @@ UserDataDirDialog::~UserDataDirDialog() {
select_file_dialog_->ListenerDestroyed();
}
-std::wstring UserDataDirDialog::GetDialogButtonLabel(
+string16 UserDataDirDialog::GetDialogButtonLabel(
ui::MessageBoxFlags::DialogButton button) const {
-
switch (button) {
case ui::MessageBoxFlags::DIALOGBUTTON_OK:
- return UTF16ToWide(l10n_util::GetStringUTF16(
- IDS_CANT_WRITE_USER_DIRECTORY_CHOOSE_DIRECTORY_BUTTON));
+ return l10n_util::GetStringUTF16(
+ IDS_CANT_WRITE_USER_DIRECTORY_CHOOSE_DIRECTORY_BUTTON);
case ui::MessageBoxFlags::DIALOGBUTTON_CANCEL:
- return UTF16ToWide(l10n_util::GetStringUTF16(
- IDS_CANT_WRITE_USER_DIRECTORY_EXIT_BUTTON));
+ return l10n_util::GetStringUTF16(
+ IDS_CANT_WRITE_USER_DIRECTORY_EXIT_BUTTON);
default:
NOTREACHED();
}
-
- return std::wstring();
+ return string16();
}
string16 UserDataDirDialog::GetWindowTitle() const {