Remove wstring from l10n_util. Part 6.

BUG=9911
TEST=no visible changes; all tests pass

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

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

1 files changed, 11 insertions, 11 deletions

diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index 088ee5a..5f6a0b0 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -692,16 +692,17 @@ class TryChromeDialog : public views::ButtonListener,
     // The heading has two flavors of text, the alt one features extensions but
     // we only use it in the US until some international issues are fixed.
     const std::string app_locale = g_browser_process->GetApplicationLocale();
-    std::wstring heading;
+    int heading_id;
     switch (version_) {
-      case 0: heading = l10n_util::GetString(IDS_TRY_TOAST_HEADING); break;
-      case 1: heading = l10n_util::GetString(IDS_TRY_TOAST_HEADING2); break;
-      case 2: heading = l10n_util::GetString(IDS_TRY_TOAST_HEADING3); break;
-      case 3: heading = l10n_util::GetString(IDS_TRY_TOAST_HEADING4); break;
+      case 0: heading_id = IDS_TRY_TOAST_HEADING; break;
+      case 1: heading_id = IDS_TRY_TOAST_HEADING2; break;
+      case 2: heading_id = IDS_TRY_TOAST_HEADING3; break;
+      case 3: heading_id = IDS_TRY_TOAST_HEADING4; break;
       default:
         NOTREACHED() << "Cannot determine which headline to show.";
         return Upgrade::TD_DIALOG_ERROR;
     }
+    string16 heading = l10n_util::GetStringUTF16(heading_id);
     views::Label* label = new views::Label(heading);
     label->SetFont(rb.GetFont(ResourceBundle::MediumBoldFont));
     label->SetMultiLine(true);
@@ -720,23 +721,22 @@ class TryChromeDialog : public views::ButtonListener,
     layout->AddView(close_button);
 
     // Second row views.
-    const std::wstring try_it(l10n_util::GetString(IDS_TRY_TOAST_TRY_OPT));
+    const string16 try_it(l10n_util::GetStringUTF16(IDS_TRY_TOAST_TRY_OPT));
     layout->StartRowWithPadding(0, 1, 0, 10);
     try_chrome_ = new views::RadioButton(try_it, 1);
     layout->AddView(try_chrome_);
     try_chrome_->SetChecked(true);
 
     // Third row views.
-    const std::wstring
-        kill_it(l10n_util::GetString(IDS_UNINSTALL_CHROME));
+    const string16 kill_it(l10n_util::GetStringUTF16(IDS_UNINSTALL_CHROME));
     layout->StartRow(0, 2);
     kill_chrome_ = new views::RadioButton(kill_it, 1);
     layout->AddView(kill_chrome_);
 
     // Fourth row views.
-    const std::wstring ok_it(l10n_util::GetString(IDS_OK));
-    const std::wstring cancel_it(l10n_util::GetString(IDS_TRY_TOAST_CANCEL));
-    const std::wstring why_this(l10n_util::GetString(IDS_TRY_TOAST_WHY));
+    const string16 ok_it(l10n_util::GetStringUTF16(IDS_OK));
+    const string16 cancel_it(l10n_util::GetStringUTF16(IDS_TRY_TOAST_CANCEL));
+    const string16 why_this(l10n_util::GetStringUTF16(IDS_TRY_TOAST_WHY));
     layout->StartRowWithPadding(0, 3, 0, 10);
     views::Button* accept_button = new views::NativeButton(this, ok_it);
     accept_button->set_tag(BT_OK_BUTTON);