views: Change MessageBoxView API to string16.

BUG=68267
R=sky@chromium.org

Review URL: http://codereview.chromium.org/8221015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104843 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 24 insertions, 26 deletions

diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc
index a0a78cf..e2bae68 100644
--- a/chrome/browser/ui/views/external_protocol_dialog.cc
+++ b/chrome/browser/ui/views/external_protocol_dialog.cc
@@ -135,22 +135,21 @@ ExternalProtocolDialog::ExternalProtocolDialog(TabContents* tab_contents,
                   kMaxUrlWithoutSchemeSize, &elided_url_without_scheme);
   ui::ElideString(WideToUTF16Hack(command), kMaxCommandSize, &elided_command);
 
-  std::wstring message_text = UTF16ToWide(l10n_util::GetStringFUTF16(
+  string16 message_text = l10n_util::GetStringFUTF16(
       IDS_EXTERNAL_PROTOCOL_INFORMATION,
       ASCIIToUTF16(url.scheme() + ":"),
-      elided_url_without_scheme) + ASCIIToUTF16("\n\n"));
+      elided_url_without_scheme) + ASCIIToUTF16("\n\n");
 
-  message_text += UTF16ToWide(l10n_util::GetStringFUTF16(
+  message_text += l10n_util::GetStringFUTF16(
       IDS_EXTERNAL_PROTOCOL_APPLICATION_TO_LAUNCH,
-      elided_command) + ASCIIToUTF16("\n\n"));
+      elided_command) + ASCIIToUTF16("\n\n");
 
-  message_text +=
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_WARNING));
+  message_text += l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_WARNING);
 
   message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kIsConfirmMessageBox,
       message_text,
-      std::wstring(),
+      string16(),
       kMessageWidth);
   message_box_view_->SetCheckBoxLabel(
       l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT));
diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc
index 9124b80..24f7bd7 100644
--- a/chrome/browser/ui/views/js_modal_dialog_views.cc
+++ b/chrome/browser/ui/views/js_modal_dialog_views.cc
@@ -23,15 +23,15 @@ JSModalDialogViews::JSModalDialogViews(
     : parent_(parent),
       message_box_view_(new views::MessageBoxView(
           parent->dialog_flags() | ui::MessageBoxFlags::kAutoDetectAlignment,
-          UTF16ToWideHack(parent->message_text()),
-          UTF16ToWideHack(parent->default_prompt_text()))) {
+          parent->message_text(),
+          parent->default_prompt_text())) {
   DCHECK(message_box_view_);
 
   message_box_view_->AddAccelerator(
       views::Accelerator(ui::VKEY_C, false, true, false));
   if (parent->display_suppress_checkbox()) {
-    message_box_view_->SetCheckBoxLabel(UTF16ToWide(
-        l10n_util::GetStringUTF16(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION)));
+    message_box_view_->SetCheckBoxLabel(
+        l10n_util::GetStringUTF16(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION));
   }
 }
 
diff --git a/chrome/browser/ui/views/repost_form_warning_view.cc b/chrome/browser/ui/views/repost_form_warning_view.cc
index 5872184..0dec119 100644
--- a/chrome/browser/ui/views/repost_form_warning_view.cc
+++ b/chrome/browser/ui/views/repost_form_warning_view.cc
@@ -37,8 +37,8 @@ RepostFormWarningView::RepostFormWarningView(
         message_box_view_(NULL) {
   message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kIsConfirmMessageBox,
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING)),
-      std::wstring());
+      l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING),
+      string16());
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
   controller_->set_window(new ConstrainedWindowViews(wrapper, this));
diff --git a/chrome/browser/ui/views/restart_message_box.cc b/chrome/browser/ui/views/restart_message_box.cc
index 09070f9..807dec0 100644
--- a/chrome/browser/ui/views/restart_message_box.cc
+++ b/chrome/browser/ui/views/restart_message_box.cc
@@ -64,9 +64,8 @@ RestartMessageBox::RestartMessageBox(gfx::NativeWindow parent_window) {
   message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kFlagHasMessage |
           ui::MessageBoxFlags::kFlagHasOKButton,
-      UTF16ToWide(
-          l10n_util::GetStringUTF16(IDS_OPTIONS_RELAUNCH_REQUIRED)).c_str(),
-      std::wstring(),
+      l10n_util::GetStringUTF16(IDS_OPTIONS_RELAUNCH_REQUIRED),
+      string16(),
       kDialogWidth);
   views::Widget::CreateWindowWithParent(this, parent_window)->Show();
 }
diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc
index f49f688..298412f 100644
--- a/chrome/browser/ui/views/simple_message_box_views.cc
+++ b/chrome/browser/ui/views/simple_message_box_views.cc
@@ -136,10 +136,9 @@ SimpleMessageBoxViews::SimpleMessageBoxViews(gfx::NativeWindow parent_window,
     : dialog_flags_(dialog_flags),
       disposition_(DISPOSITION_UNKNOWN) {
   message_box_title_ = title;
-  message_box_view_ = new views::MessageBoxView(
-      dialog_flags,
-      UTF16ToWide(message),
-      std::wstring());
+  message_box_view_ = new views::MessageBoxView(dialog_flags,
+                                                message,
+                                                string16());
   browser::CreateViewsWindow(parent_window, this)->Show();
 
   // Add reference to be released in DeleteDelegate().
diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc
index e41f1b0..1d30247 100644
--- a/chrome/browser/ui/views/update_recommended_message_box.cc
+++ b/chrome/browser/ui/views/update_recommended_message_box.cc
@@ -101,9 +101,8 @@ UpdateRecommendedMessageBox::UpdateRecommendedMessageBox(
   message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kFlagHasMessage |
           ui::MessageBoxFlags::kFlagHasOKButton,
-      UTF16ToWideHack(l10n_util::GetStringFUTF16(IDS_UPDATE_RECOMMENDED,
-                                                 product_name)),
-      std::wstring(),
+      l10n_util::GetStringFUTF16(IDS_UPDATE_RECOMMENDED, product_name),
+      string16(),
       kDialogWidth);
   browser::CreateViewsWindow(parent_window, this)->Show();
 }
diff --git a/chrome/browser/ui/views/user_data_dir_dialog.cc b/chrome/browser/ui/views/user_data_dir_dialog.cc
index 2996de9..a700958 100644
--- a/chrome/browser/ui/views/user_data_dir_dialog.cc
+++ b/chrome/browser/ui/views/user_data_dir_dialog.cc
@@ -25,13 +25,15 @@ UserDataDirDialog::UserDataDirDialog(const FilePath& user_data_dir)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           select_file_dialog_(SelectFileDialog::Create(this))),
       is_blocking_(true) {
-  std::wstring message_text = UTF16ToWide(l10n_util::GetStringFUTF16(
+  string16 message_text = l10n_util::GetStringFUTF16(
       IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY,
-      user_data_dir.LossyDisplayName()));
+      user_data_dir.LossyDisplayName());
   const int kDialogWidth = 400;
   message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kIsConfirmMessageBox,
-      message_text.c_str(), std::wstring(), kDialogWidth);
+      message_text,
+      string16(),
+      kDialogWidth);
 
   views::Widget::CreateWindow(this)->Show();
 }