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

chrome/browser/chromeos/options/language_mozc_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_mozc_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/options/language_config_util.h"
@@ skipping 104 matching lines @@
   contents_->SetBounds(0, 0, width(), height());
 }
 
 int LanguageMozcConfigView::GetDialogButtons() const {
   return MessageBoxFlags::DIALOGBUTTON_OK;
 }
 
 std::wstring LanguageMozcConfigView::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 LanguageMozcConfigView::GetWindowTitle() const {
-  return l10n_util::GetString(
-      IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SETTINGS_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SETTINGS_TITLE));
 }
 
 gfx::Size LanguageMozcConfigView::GetPreferredSize() {
   // TODO(satorux): Create our own localized content size once the UI is done.
   gfx::Size preferred_size = views::Window::GetLocalizedContentsSize(
       IDS_LANGUAGES_INPUT_DIALOG_WIDTH_CHARS,
       IDS_LANGUAGES_INPUT_DIALOG_HEIGHT_LINES);
   // TODO(mazda): Remove the manual adjustment.
   // The padding is needed for accommodating all the controls in the dialog.
   const int kHeightPadding = 80;
@@ skipping 16 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::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   for (size_t i = 0; i < language_prefs::kNumMozcBooleanPrefs; ++i) {
     MozcPrefAndAssociatedCheckbox& current = prefs_and_checkboxes_[i];
-    current.checkbox = new views::Checkbox(
-        l10n_util::GetString(language_prefs::kMozcBooleanPrefs[i].message_id));
+    current.checkbox = new views::Checkbox(UTF16ToWide(
+        l10n_util::GetStringUTF16(
+            language_prefs::kMozcBooleanPrefs[i].message_id)));
     current.checkbox->set_listener(this);
     current.checkbox->set_tag(i);
   }
   for (size_t i = 0; i < language_prefs::kNumMozcMultipleChoicePrefs; ++i) {
     MozcPrefAndAssociatedCombobox& current = prefs_and_comboboxes_[i];
     current.combobox = new LanguageCombobox(current.combobox_model);
     current.combobox->set_listener(this);
   }
   for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) {
     MozcPrefAndAssociatedSlider& current = prefs_and_sliders_[i];
     current.slider = new views::Slider(
         language_prefs::kMozcIntegerPrefs[i].min_pref_value,
         language_prefs::kMozcIntegerPrefs[i].max_pref_value,
         1,
         static_cast<views::Slider::StyleFlags>(
             views::Slider::STYLE_DRAW_VALUE |
             views::Slider::STYLE_UPDATE_ON_RELEASE),
         this);
   }
   NotifyPrefChanged();  // Sync the comboboxes with current Chrome prefs.
 
   reset_to_defaults_button_ = new views::NativeButton(
-      this, l10n_util::GetString(
-          IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_RESET_TO_DEFAULTS_BUTTON));
+      this, UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_RESET_TO_DEFAULTS_BUTTON)));
   reset_to_defaults_button_->set_tag(kResetToDefaultsButton);
   layout->StartRow(0, kColumnSetId);
   layout->AddView(reset_to_defaults_button_);
 
   // Show the checkboxes.
   for (size_t i = 0; i < language_prefs::kNumMozcBooleanPrefs; ++i) {
     const MozcPrefAndAssociatedCheckbox& current = prefs_and_checkboxes_[i];
     layout->StartRow(0, kColumnSetId);
     layout->AddView(current.checkbox, 3, 1);
   }
   // Show the comboboxes.
   for (size_t i = 0; i < language_prefs::kNumMozcMultipleChoicePrefs; ++i) {
     const MozcPrefAndAssociatedCombobox& current = prefs_and_comboboxes_[i];
     layout->StartRow(0, kColumnSetId);
     layout->AddView(new views::Label(current.combobox_model->GetLabel()));
     layout->AddView(current.combobox);
   }
   for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) {
     const MozcPrefAndAssociatedSlider& current = prefs_and_sliders_[i];
     layout->StartRow(0, kColumnSetId);
     layout->AddView(new views::Label(
-        l10n_util::GetString(
-            language_prefs::kMozcIntegerPrefs[i].message_id)));
+        UTF16ToWide(l10n_util::GetStringUTF16(
+            language_prefs::kMozcIntegerPrefs[i].message_id))));
     layout->AddView(current.slider);
   }
   NotifyPrefChanged();  // Sync the slider with current Chrome prefs.
 }
 
 void LanguageMozcConfigView::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
     NotifyPrefChanged();
@@ skipping 36 matching lines @@
   }
   for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) {
     prefs_and_sliders_[i].integer_pref.SetValue(
         language_prefs::kMozcIntegerPrefs[i].default_pref_value);
   }
   // Reflect the preference changes to the controls.
   NotifyPrefChanged();
 }
 
 }  // namespace chromeos