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

chrome/browser/spellchecker/spellcheck_service.cc

 // Copyright (c) 2012 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/spellchecker/spellcheck_service.h"
 
+#include <algorithm>
+
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
 #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h"
 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h"
 #include "chrome/browser/spellchecker/spelling_service_client.h"
 #include "chrome/common/pref_names.h"
@@ skipping 64 matching lines @@
 SpellcheckService::~SpellcheckService() {
   // Remove pref observers
   pref_change_registrar_.RemoveAll();
 }
 
 base::WeakPtr<SpellcheckService> SpellcheckService::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 // static
-int SpellcheckService::GetSpellCheckLanguages(
-    content::BrowserContext* context,
-    std::vector<std::string>* languages) {
+std::set<int> SpellcheckService::GetSpellCheckLanguages(
+      content::BrowserContext* context,
+      std::vector<std::string>* languages) {
   PrefService* prefs = user_prefs::UserPrefs::Get(context);
+  std::vector<std::string> dictionary_languages =
+      chrome::spellcheck_common::GetDictionaryLanguagesPref(prefs);
+
+  std::vector<std::string> accept_languages;
   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);
+  *languages = dictionary_languages;

[Julius, 2015/06/03 21:18:39]

Done.

+  GetSpellCheckLanguagesFromAcceptLanguages(accept_languages, languages);
 
-  for (size_t i = 0; i < languages->size(); ++i) {
-    if ((*languages)[i] == dictionary_language)
-      return i;
-  }
-  return -1;
+  // |languages| vector begins with the entries from |dictionary_languages|,
+  // therefore these indices are correct.
+  std::set<int> selected_language_indices;

[Julius, 2015/06/03 21:18:39]

Done.

+  for (size_t i = 0; i < dictionary_languages.size(); ++i)
+    selected_language_indices.insert(i);
+
+  return selected_language_indices;
 }
 
 // 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);
 
   for (std::vector<std::string>::const_iterator i = accept_languages.begin();
        i != accept_languages.end(); ++i) {
     std::string language =
         chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i);
     if (!language.empty() &&
         std::find(languages->begin(), languages->end(), language) ==
         languages->end()) {
       languages->push_back(language);
     }
@@ skipping 171 matching lines @@
 }
 
 void SpellcheckService::UpdateFeedbackSenderState() {
   if (SpellingServiceClient::IsAvailable(
           context_, SpellingServiceClient::SPELLCHECK)) {
     feedback_sender_->StartFeedbackCollection();
   } else {
     feedback_sender_->StopFeedbackCollection();
   }
 }