[Spellcheck] Unify Windows spell check feature flags
With this change, it is no longer possible to use Windows native spell
checking without ALSO using Hunspell as a fallback for unsupported
languages. While it technically hasn't been possible for some time due
to how the spell check code has evolved, this now makes it explicit.
- Removes the kWinUseHybridSpellChecker feature flag
- This was initially introduced so other Chromium projects could rely
only on the native spell checker if they didn't want to also use
Hunspell. However, there is no obvious need for that right now, so
it is easier to remove the flag than to fix it.
- Code using this flag now instead uses the kWinUseBrowserSpellChecker
feature flag.
- Removes the USE_WIN_HYBRID_SPELLCHECKER build flag
- Similarly, this build flag was used to compile out the Hunspell
fallback logic. Since the fallback logic is now mandatory, this
build flag can be removed.
- Code using this build flag now instead uses a combination of the
OS_WIN and USE_BROWSER_SPELLCHECKER build flags.
Bug: 1074450
Change-Id: I471a704901ac12d573ba2e5e42a5ef4f19a9cc61
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2226307
Reviewed-by: Guillaume Jenkins <[email protected]>
Reviewed-by: Alexei Svitkine <[email protected]>
Reviewed-by: Colin Blundell <[email protected]>
Reviewed-by: Ken Buchanan <[email protected]>
Reviewed-by: Rouslan Solomakhin <[email protected]>
Commit-Queue: Guillaume Jenkins <[email protected]>
Cr-Commit-Position: refs/heads/master@{#775266}
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index e218059..6600e44 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3099,20 +3099,10 @@
const char kWinUseBrowserSpellCheckerName[] =
"Use the Windows OS spell checker";
const char kWinUseBrowserSpellCheckerDescription[] =
- "Use the Windows OS spell checker to find spelling mistakes and provide "
- "spelling suggestions instead of using the Hunspell engine.";
-
-#if BUILDFLAG(USE_WIN_HYBRID_SPELLCHECKER)
-const char kWinUseHybridSpellCheckerName[] =
- "Use hybrid spell checking on Windows";
-const char kWinUseHybridSpellCheckerDescription[] =
- "Use both the Windows OS spell checker and the Hunspell engine to find "
- "spelling mistakes and provide spelling suggestions. Use the Windows OS "
- "spell checker first, but if a language isn't supported, fall back to the "
- "Hunspell engine. The \"Use the Windows OS spell checker\" feature flag "
- "must be enabled, otherwise this will have no effect.";
-#endif // BUILDFLAG(USE_WIN_HYBRID_SPELLCHECKER)
-
+ "For supported languages, use the Windows OS spell checker to find "
+ "spelling mistakes and provide spelling suggestions. Additional languages "
+ "can be installed in the Windows OS settings to improve Windows spell "
+ "check support.";
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
#endif // defined(OS_WIN)
