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

chrome/browser/chromeos/options/language_hangul_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_hangul_config_view.h"
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ skipping 93 matching lines @@
   contents_->SetBounds(0, 0, width(), height());
 }
 
 int LanguageHangulConfigView::GetDialogButtons() const {
   return MessageBoxFlags::DIALOGBUTTON_OK;
 }
 
 std::wstring LanguageHangulConfigView::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 LanguageHangulConfigView::GetWindowTitle() const {
-  return l10n_util::GetString(
-      IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_TITLE));
 }
 
 gfx::Size LanguageHangulConfigView::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 LanguageHangulConfigView::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);
   layout->StartRow(0, kColumnSetId);
 
   // Settings for the Hangul IME.
-  layout->AddView(new views::Label(
-      l10n_util::GetString(IDS_OPTIONS_SETTINGS_KEYBOARD_LAYOUT_TEXT)));
+  layout->AddView(new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_KEYBOARD_LAYOUT_TEXT))));
 
   hangul_keyboard_combobox_
       = new views::Combobox(hangul_keyboard_combobox_model_.get());
   hangul_keyboard_combobox_->set_listener(this);
 
   // Initialize the combobox to what's saved in user preferences. Otherwise,
   // ItemChanged() will be called with |new_index| == 0.
   NotifyPrefChanged();
   layout->AddView(hangul_keyboard_combobox_);
 }
@@ skipping 11 matching lines @@
 
 void LanguageHangulConfigView::NotifyPrefChanged() {
   const std::string id = keyboard_pref_.GetValue();
   const int index =
       hangul_keyboard_combobox_model_->GetIndexFromID(id);
   if (index >= 0)
     hangul_keyboard_combobox_->SetSelectedItem(index);
 }
 
 }  // namespace chromeos