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 --- .../components/spellcheck/common/spellcheck_features.cc | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'chromium/components/spellcheck/common/spellcheck_features.cc') diff --git a/chromium/components/spellcheck/common/spellcheck_features.cc b/chromium/components/spellcheck/common/spellcheck_features.cc index 0732801e2f2..445941b1a2a 100644 --- a/chromium/components/spellcheck/common/spellcheck_features.cc +++ b/chromium/components/spellcheck/common/spellcheck_features.cc @@ -13,11 +13,6 @@ namespace spellcheck { #if BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(USE_WIN_HYBRID_SPELLCHECKER) -const base::Feature kWinUseHybridSpellChecker{ - "WinUseHybridSpellChecker", base::FEATURE_DISABLED_BY_DEFAULT}; -#endif // BUILDFLAG(USE_WIN_HYBRID_SPELLCHECKER) - bool UseBrowserSpellChecker() { #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER) return false; @@ -33,19 +28,13 @@ bool UseBrowserSpellChecker() { const base::Feature kWinUseBrowserSpellChecker{ "WinUseBrowserSpellChecker", base::FEATURE_DISABLED_BY_DEFAULT}; +const base::Feature kWinDelaySpellcheckServiceInit{ + "WinDelaySpellcheckServiceInit", base::FEATURE_DISABLED_BY_DEFAULT}; + bool WindowsVersionSupportsSpellchecker() { return base::win::GetVersion() > base::win::Version::WIN7 && base::win::GetVersion() < base::win::Version::WIN_LAST; } - -bool UseWinHybridSpellChecker() { -#if BUILDFLAG(USE_WIN_HYBRID_SPELLCHECKER) - return base::FeatureList::IsEnabled(spellcheck::kWinUseHybridSpellChecker) && - UseBrowserSpellChecker(); -#else - return false; -#endif -} #endif // defined(OS_WIN) #if defined(OS_ANDROID) -- cgit v1.2.1