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..1a1ee623bab37bb8b5dc8377da346ce317f3f553 100644 |
--- a/chrome/browser/spellchecker/spellcheck_factory.cc |
+++ b/chrome/browser/spellchecker/spellcheck_factory.cc |
@@ -8,6 +8,7 @@ |
#include "chrome/browser/profiles/incognito_helpers.h" |
#include "chrome/browser/spellchecker/spellcheck_service.h" |
#include "chrome/common/pref_names.h" |
+#include "chrome/common/spellcheck_common.h" |
#include "chrome/grit/locale_settings.h" |
#include "components/keyed_service/content/browser_context_dependency_manager.h" |
#include "components/pref_registry/pref_registry_syncable.h" |
@@ -69,9 +70,16 @@ 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 (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) { |
+ user_prefs->RegisterStringPref( |
+ prefs::kSpellCheckDictionaries, |
+ l10n_util::GetStringUTF8(IDS_SPELLCHECK_DICTIONARY)); |
please use gerrit instead
2015/06/23 21:56:01
This statement is hard to read. Would it be easier
Julius
2015/06/24 21:18:00
Done.
|
+ } else { |
+ user_prefs->RegisterStringPref( |
+ prefs::kSpellCheckDictionary, |
+ l10n_util::GetStringUTF8(IDS_SPELLCHECK_DICTIONARY)); |
+ } |
user_prefs->RegisterBooleanPref(prefs::kSpellCheckUseSpellingService, false); |
user_prefs->RegisterBooleanPref( |
prefs::kEnableContinuousSpellcheck, |