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 "base/command_line.h"
 #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/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "ipc/ipc_platform_file.h"
 
@@ skipping 51 matching lines @@
                  content::NOTIFICATION_RENDERER_PROCESS_CREATED,
                  content::NotificationService::AllSources());
 }
 
 SpellcheckService::~SpellcheckService() {
   // Remove pref observers
   pref_change_registrar_.RemoveAll();
 }
 
 // static
-int SpellcheckService::GetSpellCheckLanguages(
+std::set<int> SpellcheckService::GetSpellCheckLanguages(
     content::BrowserContext* 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;
+  std::vector<std::string> dictionary_languages =
+      GetSpellCheckDictionaryLanguages(prefs);
 
-#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
+  // Put the currently selected languages as first ones on the list
+  *languages = dictionary_languages;
+  GetSpellCheckLanguagesFromAcceptLanguages(GetAcceptLanguages(prefs),
+                                            languages);
 
-  GetSpellCheckLanguagesFromAcceptLanguages(
-      accept_languages, dictionary_language, languages);
-
-  for (size_t i = 0; i < languages->size(); ++i) {
-    if ((*languages)[i] == dictionary_language)
-      return i;
-  }
-  return -1;
+  std::set<int> selected_languages;
+  for (size_t i = 0; i < dictionary_languages.size(); ++i)
+    selected_languages.insert(i);
+  return selected_languages;
 }
 
 // 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 100 matching lines @@
 void SpellcheckService::OnHunspellDictionaryDownloadBegin() {
 }
 
 void SpellcheckService::OnHunspellDictionaryDownloadSuccess() {
 }
 
 void SpellcheckService::OnHunspellDictionaryDownloadFailure() {
 }
 
 // static
+std::vector<std::string> SpellcheckService::GetAcceptLanguages(

[please use gerrit instead, 2014/10/24 19:25:16]

It's usually best for readability to inline the functions that are used only
once.

+    PrefService* prefs) {
+  std::vector<std::string> accept_languages;
+
+  StringPrefMember accept_languages_pref;
+  accept_languages_pref.Init(prefs::kAcceptLanguages, prefs);
+
+#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
+
+  return accept_languages;
+}
+
+// static
+std::vector<std::string> SpellcheckService::GetSpellCheckDictionaryLanguages(

[please use gerrit instead, 2014/10/24 19:25:16]

Ditto.

+    PrefService* prefs) {
+  std::vector<std::string> dictionary_languages;
+
+  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kEnableMultilingualSpellChecker)) {
+    StringPrefMember dictionary_languages_pref;
+    dictionary_languages_pref.Init(prefs::kSpellCheckDictionaries, prefs);
+
+    base::SplitString(
+        dictionary_languages_pref.GetValue(), ',', &dictionary_languages);
+  } else {
+    StringPrefMember dictionary_language_pref;
+    dictionary_language_pref.Init(prefs::kSpellCheckDictionary, prefs);
+
+    dictionary_languages.push_back(dictionary_language_pref.GetValue());
+  }
+
+  return dictionary_languages;
+}
+
+// static
 void SpellcheckService::AttachStatusEvent(base::WaitableEvent* status_event) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   g_status_event = status_event;
 }
 
 // static
 SpellcheckService::EventType SpellcheckService::GetStatusEvent() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return g_status_type;
@@ skipping 50 matching lines @@
 }
 
 void SpellcheckService::UpdateFeedbackSenderState() {
   if (SpellingServiceClient::IsAvailable(
           context_, SpellingServiceClient::SPELLCHECK)) {
     feedback_sender_->StartFeedbackCollection();
   } else {
     feedback_sender_->StopFeedbackCollection();
   }
 }