From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- .../spellcheck/common/spellcheck_features.h | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'chromium/components/spellcheck/common/spellcheck_features.h') diff --git a/chromium/components/spellcheck/common/spellcheck_features.h b/chromium/components/spellcheck/common/spellcheck_features.h index ed2936f88de..282bd74cbb8 100644 --- a/chromium/components/spellcheck/common/spellcheck_features.h +++ b/chromium/components/spellcheck/common/spellcheck_features.h @@ -13,17 +13,32 @@ namespace spellcheck { #if BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(USE_WIN_HYBRID_SPELLCHECKER) -extern const base::Feature kWinUseHybridSpellChecker; -#endif // BUILDFLAG(USE_WIN_HYBRID_SPELLCHECKER) - bool UseBrowserSpellChecker(); #if defined(OS_WIN) extern const base::Feature kWinUseBrowserSpellChecker; +// If the kWinDelaySpellcheckServiceInit feature flag is enabled, don't +// initialize the spellcheck dictionaries when the SpellcheckService is +// instantiated. With this flag set: (1) Completing the initialization of the +// spellcheck service is on-demand, invoked by calling +// SpellcheckService::InitializeDictionaries with a callback to indicate when +// the operation completes. (2) The call to create the spellcheck service in +// ChromeBrowserMainParts::PreMainMessageLoopRunImpl will be skipped. Chromium +// will still by default instantiate the spellcheck service on startup for +// custom dictionary synchronization, but will not load Windows spellcheck +// dictionaries. The command line for launching the browser with Windows hybrid +// spellchecking enabled but no initialization of the spellcheck service is: +// chrome +// --enable-features=WinUseBrowserSpellChecker,WinDelaySpellcheckServiceInit +// and if instantiation of the spellcheck service needs to be completely +// disabled: +// chrome +// --enable-features=WinUseBrowserSpellChecker,WinDelaySpellcheckServiceInit +// --disable-sync-types="Dictionary" +extern const base::Feature kWinDelaySpellcheckServiceInit; + bool WindowsVersionSupportsSpellchecker(); -bool UseWinHybridSpellChecker(); #endif // defined(OS_WIN) #if defined(OS_ANDROID) -- cgit v1.2.1