Replace std:;wstring with std::string in locale-name related APIs....

chrome/browser/views/options/languages_page_view.cc

 // Copyright (c) 2006-2008 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 <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/views/options/languages_page_view.h"
 
@@ skipping 273 matching lines @@
                                                  views::View* child) {
   // Can't init before we're inserted into a Widget, because we require
   // a HWND to parent native child controls to.
   if (is_add && child == this)
     Init();
 }
 
 void AddLanguageWindowView::Init() {
   // Determine Locale Codes.
   std::vector<std::string> locale_codes;
-  const std::wstring app_locale = g_browser_process->GetApplicationLocale();
+  const std::string app_locale = g_browser_process->GetApplicationLocale();
   for (size_t i = 0; i < arraysize(accept_language_list); ++i) {
-    std::wstring local_name =
-        l10n_util::GetLocalName(accept_language_list[i], app_locale, false);
+    string16 display_name =
+        l10n_util::GetDisplayNameForLocale(accept_language_list[i],
+                                           app_locale, false);
     // This is a hack. If ICU doesn't have a translated name for
-    // this language, GetLocalName will just return the language code.
-    // In that case, we skip it.
+    // this language, GetDisplayNameForLocale will just return the
+    // language code. In that case, we skip it.
     // TODO(jungshik) : Put them at the of the list with language codes
     // enclosed by brackets.
-    if (IsStringASCII(local_name) &&
-        WideToASCII(local_name) == accept_language_list[i])
+    if (IsStringASCII(display_name) &&
+        UTF16ToASCII(display_name) == accept_language_list[i])
       continue;
     locale_codes.push_back(accept_language_list[i]);
   }
   accept_language_combobox_model_.reset(new LanguageComboboxModel(
     profile_, locale_codes));
   accept_language_combobox_ = new views::Combobox(
       accept_language_combobox_model_.get());
   accept_language_combobox_->SetSelectedItem(0);
   accept_language_combobox_->set_listener(this);
   AddChildView(accept_language_combobox_);
@@ skipping 59 matching lines @@
     Add(languages_vector.at(i));
   }
 }
 
 void LanguageOrderTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }
 
 std::wstring LanguageOrderTableModel::GetText(int row, int column_id) {
   DCHECK(row >= 0 && row < RowCount());
-  const std::wstring app_locale = g_browser_process->GetApplicationLocale();
-  return l10n_util::GetLocalName(languages_.at(row), app_locale, true);
+  const std::string app_locale = g_browser_process->GetApplicationLocale();
+  return l10n_util::GetDisplayNameForLocale(languages_.at(row),
+                                            app_locale,
+                                            true);
 }
 
 void LanguageOrderTableModel::Add(const std::string& language) {
   if (language.empty())
     return;
   // Check for selecting duplicated language.
   for (std::vector<std::string>::const_iterator cit = languages_.begin();
        cit != languages_.end(); ++cit)
     if (*cit == language)
       return;
@@ skipping 299 matching lines @@
     language_order_table_model_->SetAcceptLanguagesString(
         WideToASCII(accept_languages_.GetValue()));
   }
   if (!pref_name || *pref_name == prefs::kApplicationLocale) {
     int index = ui_language_model_->GetSelectedLanguageIndex(
         prefs::kApplicationLocale);
     if (-1 == index) {
       // The pref value for locale isn't valid.  Use the current app locale
       // (which is what we're currently using).
       index = ui_language_model_->GetIndexFromLocale(
-          WideToASCII(g_browser_process->GetApplicationLocale()));
+          g_browser_process->GetApplicationLocale());
     }
     DCHECK(-1 != index);
     change_ui_language_combobox_->SetSelectedItem(index);
     starting_ui_language_index_ = index;
   }
   if (!pref_name || *pref_name == prefs::kSpellCheckDictionary) {
     int index = dictionary_language_model_->GetSelectedLanguageIndex(
         prefs::kSpellCheckDictionary);
 
     // If the index for the current language cannot be found, it is due to
@@ skipping 154 matching lines @@
   }
 
   if (enable_spellcheck_checkbox_clicked_)
     enable_spellcheck_.SetValue(enable_spellchecking_checkbox_->checked());
 
   if (enable_autospellcorrect_checkbox_clicked_) {
     enable_autospellcorrect_.SetValue(
         enable_autospellcorrect_checkbox_->checked());
   }
 }