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

chrome/browser/spellchecker/spellcheck_factory.cc

Index: chrome/browser/spellchecker/spellcheck_factory.cc
diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc
index 7d7e1df68fa11fd40643e1065c3dc9c7e85e1362..589efec88d7b5a5239a26bd312b3b0047acc221b 100644
--- a/chrome/browser/spellchecker/spellcheck_factory.cc
+++ b/chrome/browser/spellchecker/spellcheck_factory.cc
@@ -4,9 +4,11 @@
 
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 
+#include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -67,11 +69,23 @@ KeyedService* SpellcheckServiceFactory::BuildServiceInstanceFor(
 
 void SpellcheckServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* user_prefs) {
-  // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.
-  user_prefs->RegisterStringPref(
-      prefs::kSpellCheckDictionary,
-      l10n_util::GetStringUTF8(IDS_SPELLCHECK_DICTIONARY),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
+
+  if (command_line->HasSwitch(switches::kEnableMultilingualSpellChecker)) {
+    user_prefs->RegisterStringPref(
+        prefs::kSpellCheckDictionaries,
+        l10n_util::GetStringUTF8(IDS_SPELLCHECK_DICTIONARY),
+        user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  } else {
+    // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.

[please use gerrit instead, 2015/02/24 23:38:38]

This TODO applies to both clauses of the if statement. Please move it
immediately before the statement.

[Klemen Forstnerič, 2015/02/25 09:48:23]

Done.

+    user_prefs->RegisterStringPref(
+        prefs::kSpellCheckDictionary,
+        l10n_util::GetStringUTF8(IDS_SPELLCHECK_DICTIONARY),
+        user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  }
+
   user_prefs->RegisterBooleanPref(
       prefs::kSpellCheckUseSpellingService,
       false,