Remove wstring from l10n_util. Part 8, the last part....

chrome/browser/chromeos/options/language_pinyin_config_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/options/language_pinyin_config_view.h"
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/input_method_library.h"
@@ skipping 58 matching lines @@
   contents_->SetBounds(0, 0, width(), height());
 }
 
 int LanguagePinyinConfigView::GetDialogButtons() const {
   return MessageBoxFlags::DIALOGBUTTON_OK;
 }
 
 std::wstring LanguagePinyinConfigView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
-    return l10n_util::GetString(IDS_OK);
+    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_OK));
   }
   return L"";
 }
 
 std::wstring LanguagePinyinConfigView::GetWindowTitle() const {
-  return l10n_util::GetString(
-      IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTINGS_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTINGS_TITLE));
 }
 
 gfx::Size LanguagePinyinConfigView::GetPreferredSize() {
   // TODO(satorux): Create our own localized content size once the UI is done.
   return gfx::Size(views::Window::GetLocalizedContentsSize(
       IDS_LANGUAGES_INPUT_DIALOG_WIDTH_CHARS,
       IDS_LANGUAGES_INPUT_DIALOG_HEIGHT_LINES));
 }
 
 void LanguagePinyinConfigView::InitControlLayout() {
@@ skipping 11 matching lines @@
   const int kColumnSetId = 0;
   ColumnSet* column_set = layout->AddColumnSet(kColumnSetId);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
     pinyin_boolean_checkboxes_[i] = new views::Checkbox(
-        l10n_util::GetString(
-            language_prefs::kPinyinBooleanPrefs[i].message_id));
+        UTF16ToWide(l10n_util::GetStringUTF16(
+            language_prefs::kPinyinBooleanPrefs[i].message_id)));
     pinyin_boolean_checkboxes_[i]->set_listener(this);
     pinyin_boolean_checkboxes_[i]->set_tag(i);
   }
   double_pinyin_schema_.combobox =
       new LanguageCombobox(double_pinyin_schema_.combobox_model);
   double_pinyin_schema_.combobox->set_listener(this);
 
   NotifyPrefChanged();
   for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
     layout->StartRow(0, kColumnSetId);
@@ skipping 21 matching lines @@
   const int value = double_pinyin_schema_.multiple_choice_pref.GetValue();
   for (int i = 0; i < double_pinyin_schema_.combobox_model->num_items(); ++i) {
     if (double_pinyin_schema_.combobox_model->GetConfigValueAt(i) == value) {
       double_pinyin_schema_.combobox->SetSelectedItem(i);
       break;
     }
   }
 }
 
 }  // namespace chromeos