chrome/browser/spellchecker/spellcheck_factory.cc - Issue 1156473007: Enables the user to select multiple languages for spellchecking (UI)

Unified Diff: chrome/browser/spellchecker/spellcheck_factory.cc

Issue 1156473007: Enables the user to select multiple languages for spellchecking (UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Reverted from using any #if defines to exclude Mac compiles. Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc ('K') | « chrome/browser/resources/options/options.js ('k') | chrome/browser/spellchecker/spellcheck_service.h » ('j') | chrome/browser/spellchecker/spellcheck_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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,