Chromium Code Reviews| Index: chrome/browser/spellchecker/spellcheck_factory.cc |
| diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc |
| index edbed4055410f4b5c9027f3023dea245aa2fd68d..d70bdd96a051d85afbca416502c2a419dbfba58f 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" |
| @@ -69,9 +71,20 @@ 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)); |
| + |
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kEnableMultilingualSpellChecker)) { |
|
Julius
2015/06/03 21:18:39
This should suffice for now but a TODO has been ad
|
| + user_prefs->RegisterStringPref( |
| + prefs::kSpellCheckDictionaries, |
| + l10n_util::GetStringUTF8(IDS_SPELLCHECK_DICTIONARY), |
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
|
Julius
2015/06/03 21:18:39
This should suffice for now but a TODO has been ad
|
| + } else { |
| + user_prefs->RegisterStringPref( |
| + prefs::kSpellCheckDictionary, |
| + l10n_util::GetStringUTF8(IDS_SPELLCHECK_DICTIONARY), |
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| + } |
| + |
| user_prefs->RegisterBooleanPref(prefs::kSpellCheckUseSpellingService, false); |
| user_prefs->RegisterBooleanPref( |
| prefs::kEnableContinuousSpellcheck, |