Change SpellChecker::Language to be an ASCII string.

Review URL: http://codereview.chromium.org/41028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11407 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 20 insertions, 2 deletions

diff --git a/chrome/browser/views/options/language_combobox_model.cc b/chrome/browser/views/options/language_combobox_model.cc
index eccaaa7..556cd06 100644
--- a/chrome/browser/views/options/language_combobox_model.cc
+++ b/chrome/browser/views/options/language_combobox_model.cc
@@ -31,6 +31,17 @@ LanguageComboboxModel::LanguageComboboxModel(
   InitNativeNames(locale_codes);
 }
 
+LanguageComboboxModel::LanguageComboboxModel(
+    Profile* profile, const std::vector<std::string>& locale_codes)
+    : profile_(profile) {
+  std::vector<std::wstring> locale_codes_w;
+  for (std::vector<std::string>::const_iterator iter = locale_codes.begin();
+      iter != locale_codes.end(); ++iter) {
+    locale_codes_w.push_back(ASCIIToWide(*iter));
+  }
+  InitNativeNames(locale_codes_w);
+}
+
 void LanguageComboboxModel::InitNativeNames(const std::vector<std::wstring>&
                                             locale_codes) {
   const std::string app_locale = WideToASCII(
diff --git a/chrome/browser/views/options/language_combobox_model.h b/chrome/browser/views/options/language_combobox_model.h
index 896834c..de23de8 100644
--- a/chrome/browser/views/options/language_combobox_model.h
+++ b/chrome/browser/views/options/language_combobox_model.h
@@ -29,6 +29,11 @@ class LanguageComboboxModel : public views::ComboBox::Model {
   LanguageComboboxModel(Profile* profile,
                         const std::vector<std::wstring>& locale_codes);
 
+  // Temporary compatibility constructor.
+  // TODO(port): remove this once locale codes are all switched to ASCII.
+  LanguageComboboxModel(Profile* profile,
+                        const std::vector<std::string>& locale_codes);
+
   virtual ~LanguageComboboxModel() {}
 
   void InitNativeNames(const std::vector<std::wstring>& locale_codes);
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 1eb821f..25fc147 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -39,6 +39,7 @@
 #include "skia/include/SkBitmap.h"
 #include "unicode/uloc.h"
 
+// TODO(port): this should be a char* list.
 static const wchar_t* const accept_language_list[] = {
   L"af",     // Afrikaans
   L"am",     // Amharic
@@ -719,8 +720,9 @@ void LanguagesPageView::NotifyPrefChanged(const std::wstring* pref_name) {
       DCHECK(local_state);
       const std::wstring& lang_region = local_state->GetString(
           prefs::kSpellCheckDictionary);
-      dictionary_language_.SetValue(
-          SpellChecker::GetLanguageFromLanguageRegion(lang_region));
+      dictionary_language_.SetValue(ASCIIToWide(
+          SpellChecker::GetLanguageFromLanguageRegion(
+          WideToASCII(lang_region))));
       index = dictionary_language_model_->GetSelectedLanguageIndex(
           prefs::kSpellCheckDictionary);
     }