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..7c322aee461930a40fd3d722d78df496991558e3 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"
@@ -43,10 +44,20 @@ SpellcheckService::SpellcheckService(content::BrowserContext* context)
   PrefService* prefs = user_prefs::UserPrefs::Get(context);
   pref_change_registrar_.Init(prefs);
 
+  std::string locale;

[please use gerrit instead, 2015/06/23 00:43:05]

Rename to spellcheck_language.

[Julius, 2015/06/24 21:17:59]

Done.

   std::string language_code;

[please use gerrit instead, 2015/06/23 00:43:06]

Move to right above GetISOLanguageCountryCodeFromLocale().

[Julius, 2015/06/24 21:17:59]

Done.

   std::string country_code;

[please use gerrit instead, 2015/06/23 00:43:05]

Move to right above GetISOLanguageCountryCodeFromLocale().

[Julius, 2015/06/24 21:17:59]

Done.

+  if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) {
+    std::vector<std::string> dictionary_languages;
+    base::SplitString(prefs->GetString(prefs::kSpellCheckDictionaries), ',',
+                      &dictionary_languages);
+    locale = dictionary_languages[0];
+  } else {
+    locale = prefs->GetString(prefs::kSpellCheckDictionary);
+  }
+
   chrome::spellcheck_common::GetISOLanguageCountryCodeFromLocale(
-      prefs->GetString(prefs::kSpellCheckDictionary),
+      locale,
       &language_code,
       &country_code);
   feedback_sender_.reset(new spellcheck::FeedbackSender(
@@ -56,21 +67,32 @@ SpellcheckService::SpellcheckService(content::BrowserContext* context)
       prefs::kEnableAutoSpellCorrect,
       base::Bind(&SpellcheckService::OnEnableAutoSpellCorrectChanged,
                  base::Unretained(this)));
-  pref_change_registrar_.Add(
-      prefs::kSpellCheckDictionary,
-      base::Bind(&SpellcheckService::OnSpellCheckDictionaryChanged,
-                 base::Unretained(this)));
- pref_change_registrar_.Add(
-     prefs::kSpellCheckUseSpellingService,
-     base::Bind(&SpellcheckService::OnUseSpellingServiceChanged,
-                base::Unretained(this)));
+
+#if !defined(OS_MACOSX)
+  if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) {
+    pref_change_registrar_.Add(
+        prefs::kSpellCheckDictionaries,
+        base::Bind(&SpellcheckService::OnSpellCheckDictionaryChanged,
+                   base::Unretained(this)));
+  } else {
+    pref_change_registrar_.Add(
+        prefs::kSpellCheckDictionary,
+        base::Bind(&SpellcheckService::OnSpellCheckDictionaryChanged,
+                   base::Unretained(this)));
+  }
+  OnSpellCheckDictionaryChanged();
+#endif

[please use gerrit instead, 2015/06/23 00:43:06]

#endif  // !defined(OS_MACOSX)

[Julius, 2015/06/24 21:17:59]

Done.

+  if (!chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) {

[please use gerrit instead, 2015/06/23 00:43:06]

Add one empty line after #endif for clarity.

[Julius, 2015/06/24 21:17:59]

Done.

+    pref_change_registrar_.Add(
+        prefs::kSpellCheckUseSpellingService,
+        base::Bind(&SpellcheckService::OnUseSpellingServiceChanged,
+                   base::Unretained(this)));
+  }

[please use gerrit instead, 2015/06/23 00:43:06]

Add one empty line after } for clarity.

[Julius, 2015/06/24 21:17:59]

Done.

   pref_change_registrar_.Add(
       prefs::kEnableContinuousSpellcheck,
       base::Bind(&SpellcheckService::InitForAllRenderers,
                  base::Unretained(this)));
 
-  OnSpellCheckDictionaryChanged();
-
   custom_dictionary_.reset(new SpellcheckCustomDictionary(context_->GetPath()));
   custom_dictionary_->AddObserver(this);
   custom_dictionary_->Load();
@@ -89,47 +111,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 +132,14 @@ void SpellcheckService::GetSpellCheckLanguagesFromAcceptLanguages(
         chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i);
     if (!language.empty() &&
         std::find(languages->begin(), languages->end(), language) ==
-        languages->end()) {
+            languages->end()) {

[please use gerrit instead, 2015/06/23 00:43:06]

Did clang-format do this? I keep forgetting.

[Julius, 2015/06/24 21:17:59]

Yeah, clang-format did this.

       languages->push_back(language);
     }
   }
+
+  return enabled_spellcheck_languages;
 }
+#endif  // !OS_MACOSX

[please use gerrit instead, 2015/06/23 00:43:06]

#endif  // !defined(OS_MACOSX)

[Julius, 2015/06/24 21:17:59]

Done.

 
 // static
 bool SpellcheckService::SignalStatusEvent(
@@ -285,14 +283,24 @@ void SpellcheckService::OnEnableAutoSpellCorrectChanged() {
   }
 }
 
+#if !defined(OS_MACOSX)
 void SpellcheckService::OnSpellCheckDictionaryChanged() {
   if (hunspell_dictionary_.get())
     hunspell_dictionary_->RemoveObserver(this);
-  PrefService* prefs = user_prefs::UserPrefs::Get(context_);
-  DCHECK(prefs);
 
-  std::string dictionary =
-      prefs->GetString(prefs::kSpellCheckDictionary);
+  std::string dictionary;
+  if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) {
+    std::vector<std::string> languages;
+    size_t dictionary_languages = GetSpellCheckLanguages(context_, &languages);
+    if (dictionary_languages <= 0) {

[please use gerrit instead, 2015/06/23 00:43:06]

size_t is unsigned, so it cannot be < 0.

http://www.cplusplus.com/reference/cstring/size_t/

[Julius, 2015/06/24 21:17:59]

Done.

+      return;
+    } else {
+      dictionary = languages[0];
+    }

[please use gerrit instead, 2015/06/23 00:43:05]

Chromium's C++ code usually does not have curlies {} for single-line
if-statments:

if (dictionary_languages > 0)
  dictionary = languages[0];
else
  return;

[Julius, 2015/06/24 21:17:59]

Done.

+  } else {
+    dictionary = user_prefs::UserPrefs::Get(context_)
+                     ->GetString(prefs::kSpellCheckDictionary);

[please use gerrit instead, 2015/06/23 00:43:06]

Is this clang-format's doing?

[Julius, 2015/06/24 21:17:59]

Yep, clang-format.

+  }
   hunspell_dictionary_.reset(new SpellcheckHunspellDictionary(
       dictionary, context_->GetRequestContext(), this));
   hunspell_dictionary_->AddObserver(this);
@@ -304,6 +312,7 @@ void SpellcheckService::OnSpellCheckDictionaryChanged() {
   feedback_sender_->OnLanguageCountryChange(language_code, country_code);
   UpdateFeedbackSenderState();
 }
+#endif

[please use gerrit instead, 2015/06/23 00:43:06]

#endif  // !defined(OS_MACOSX)

[Julius, 2015/06/24 21:17:59]

Done.

 
 void SpellcheckService::OnUseSpellingServiceChanged() {
   bool enabled = pref_change_registrar_.prefs()->GetBoolean(