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

chrome/browser/chromeos/options/language_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_config_view.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 162 matching lines @@
       prefs->SetString(prefs::kApplicationLocale, button->language_code());
       prefs->SavePersistentPrefs();
       RestartMessageBox::ShowMessageBox(GetWindow()->GetNativeWindow());
     }
   }
 }
 
 std::wstring LanguageConfigView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
-    return l10n_util::GetString(IDS_DONE);
+    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_DONE));
   }
   return L"";
 }
 
 std::wstring LanguageConfigView::GetWindowTitle() const {
-  return l10n_util::GetString(
-      IDS_OPTIONS_SETTINGS_LANGUAGES_DIALOG_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_LANGUAGES_DIALOG_TITLE));
 }
 
 void LanguageConfigView::Layout() {
   // Not sure why but this is needed to show contents in the dialog.
   root_container_->SetBounds(0, 0, width(), height());
 }
 
 gfx::Size LanguageConfigView::GetPreferredSize() {
   return gfx::Size(views::Window::GetLocalizedContentsSize(
       IDS_LANGUAGES_INPUT_DIALOG_WIDTH_CHARS,
@@ skipping 258 matching lines @@
         true);
   }
   // Create the add language combobox.
   add_language_combobox_
       = new views::Combobox(add_language_combobox_model_.get());
   add_language_combobox_->set_listener(this);
   ResetAddLanguageCombobox();
 
   // Create the remove button.
   remove_language_button_ = new views::NativeButton(
-      this, l10n_util::GetString(
-          IDS_OPTIONS_SETTINGS_LANGUAGES_REMOVE_BUTTON));
+      this, UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_REMOVE_BUTTON)));
   remove_language_button_->set_tag(kRemoveLanguageButton);
 
   // Add the add and remove buttons.
   layout->StartRow(0, kButtonsColumnSetId);
   layout->AddView(add_language_combobox_);
   layout->AddView(remove_language_button_);
 
   return contents;
 }
 
@@ skipping 42 matching lines @@
 
   // Add the language name label.
   layout->StartRow(0, kPerLanguageTitleColumnSetId);
   layout->AddView(language_name_label);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, kPerLanguageSingleColumnSetId);
   if (application_locale == language_code) {
     layout->AddView(
         new views::Label(
-            l10n_util::GetStringF(
+            UTF16ToWide(l10n_util::GetStringFUTF16(
                 IDS_OPTIONS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE,
-                l10n_util::GetString(IDS_PRODUCT_OS_NAME))));
+                l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME)))));
   } else {
     UiLanguageButton* button = new UiLanguageButton(
-      this, l10n_util::GetStringF(
+      this, UTF16ToWide(l10n_util::GetStringFUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE,
-          l10n_util::GetString(IDS_PRODUCT_OS_NAME)),
+          l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME))),
       language_code);
     button->set_tag(kChangeUiLanguageButton);
     layout->AddView(button);
   }
 }
 
 void LanguageConfigView::AddInputMethodSection(
     const std::string& language_code,
     views::GridLayout* layout) {
   // Create the input method title label.
   views::Label* input_method_title_label = new views::Label(
-      l10n_util::GetString(
-          IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD));
+      UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD)));
   input_method_title_label->SetFont(
       input_method_title_label->font().DeriveFont(0, gfx::Font::BOLD));
 
   // Add the input method title label.
   layout->StartRow(0, kPerLanguageTitleColumnSetId);
   layout->AddView(input_method_title_label);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   // Add input method names and configuration buttons.
   input_method_checkboxes_.clear();
@@ skipping 16 matching lines @@
       checkbox->SetChecked(true);
     }
 
     layout->AddView(checkbox);
     input_method_checkboxes_.insert(checkbox);
     // Add "configure" button for the input method if we have a
     // configuration dialog for it.
     if (input_method_config_view_map_.count(input_method_id) > 0) {
       InputMethodButton* button = new InputMethodButton(
           this,
-          l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_CONFIGURE),
+          UTF16ToWide(l10n_util::GetStringUTF16(
+              IDS_OPTIONS_SETTINGS_LANGUAGES_CONFIGURE)),
           input_method_id);
       button->set_tag(kConfigureInputMethodButton);
       layout->AddView(button);
     }
   }
 }
 
 views::DialogDelegate* LanguageConfigView::CreateInputMethodConfigureView(
     const std::string& input_method_id) {
   InputMethodConfigViewMap::const_iterator iter =
@@ skipping 20 matching lines @@
 
 void LanguageConfigView::EnableAllCheckboxes() {
   for (std::set<InputMethodCheckbox*>::iterator checkbox =
            input_method_checkboxes_.begin();
        checkbox != input_method_checkboxes_.end(); ++checkbox) {
     (*checkbox)->SetEnabled(true);
   }
 }
 
 }  // namespace chromeos