Enables the user to select multiple languages for spellchecking (UI)

chrome/browser/spellchecker/spellcheck_service.cc

Index: chrome/browser/spellchecker/spellcheck_service.cc
diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
index 314b32405a47d2fef77e751a256bff3e4914ddf8..2f137fd22cee58fa2cf6d48fe2061464290c565b 100644
--- a/chrome/browser/spellchecker/spellcheck_service.cc
+++ b/chrome/browser/spellchecker/spellcheck_service.cc
@@ -8,6 +8,7 @@
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
+#include "base/supports_user_data.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/spellchecker/feedback_sender.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
@@ -89,47 +90,20 @@ base::WeakPtr<SpellcheckService> SpellcheckService::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
+#if !defined(OS_MACOSX)
 // static
-int SpellcheckService::GetSpellCheckLanguages(
-    content::BrowserContext* context,
+size_t SpellcheckService::GetSpellCheckLanguages(
+    base::SupportsUserData* context,
     std::vector<std::string>* languages) {
   PrefService* prefs = user_prefs::UserPrefs::Get(context);
   StringPrefMember accept_languages_pref;
-  StringPrefMember dictionary_language_pref;
   accept_languages_pref.Init(prefs::kAcceptLanguages, prefs);
-  dictionary_language_pref.Init(prefs::kSpellCheckDictionary, prefs);
-  std::string dictionary_language = dictionary_language_pref.GetValue();
 
-  // Now scan through the list of accept languages, and find possible mappings
-  // from this list to the existing list of spell check languages.
   std::vector<std::string> accept_languages;
-
-#if defined(OS_MACOSX)
-  if (spellcheck_mac::SpellCheckerAvailable())
-    spellcheck_mac::GetAvailableLanguages(&accept_languages);
-  else
-    base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages);
-#else
   base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages);
-#endif  // !OS_MACOSX
-
-  GetSpellCheckLanguagesFromAcceptLanguages(
-      accept_languages, dictionary_language, languages);
-
-  for (size_t i = 0; i < languages->size(); ++i) {
-    if ((*languages)[i] == dictionary_language)
-      return i;
-  }
-  return -1;
-}
 
-// static
-void SpellcheckService::GetSpellCheckLanguagesFromAcceptLanguages(
-    const std::vector<std::string>& accept_languages,
-    const std::string& dictionary_language,
-    std::vector<std::string>* languages) {
-  // The current dictionary language should be there.
-  languages->push_back(dictionary_language);
+  *languages = chrome::spellcheck_common::GetDictionaryLanguagesPref(prefs);
+  size_t enabled_spellcheck_languages = languages->size();
 
   for (std::vector<std::string>::const_iterator i = accept_languages.begin();
        i != accept_languages.end(); ++i) {
@@ -137,11 +111,14 @@ void SpellcheckService::GetSpellCheckLanguagesFromAcceptLanguages(
         chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i);
     if (!language.empty() &&
         std::find(languages->begin(), languages->end(), language) ==
-        languages->end()) {
+            languages->end()) {
       languages->push_back(language);
     }
   }
+
+  return enabled_spellcheck_languages;
 }
+#endif  // !OS_MACOSX
 
 // static
 bool SpellcheckService::SignalStatusEvent(