diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2024-05-15 09:45:37 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2025-03-04 13:41:58 +0000 |
| commit | 54fcd2b16d568ba3debc9940e4e83b88e8a26845 (patch) | |
| tree | ad6aa529042f52d1c1e861bcadbeedff2bbc88f5 | |
| parent | fc8c2771912f66214898145dd61d3512a755d80e (diff) | |
FIXUP: Update handling of loading the dictionary108-based
Do not include spellcheck headers in BrowserContext because it does not
depend on spellcheck component and breaks build if
spellcheck_buildflags.h is not yet generated.
Task-number: QTBUG-124375
Change-Id: Ie732b89c0aa49c846a41b92757e10d47b08a065f
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/561409
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 856e8da14da497455f67dbd499f690fe1be43429)
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/628858
Reviewed-by: Anu Aliyas <anu.aliyas@qt.io>
| -rw-r--r-- | chromium/content/browser/browser_context.cc | 5 | ||||
| -rw-r--r-- | chromium/content/public/browser/browser_context.h | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/chromium/content/browser/browser_context.cc b/chromium/content/browser/browser_context.cc index db928f54e19..9099ae05956 100644 --- a/chromium/content/browser/browser_context.cc +++ b/chromium/content/browser/browser_context.cc @@ -345,6 +345,11 @@ void BrowserContext::WriteIntoTrace( // section into a separate BrowserContextDelegate class and a separate // browser_context_delegate.cc source file. +#if defined(TOOLKIT_QT) +void BrowserContext::FailedToLoadDictionary(const std::string&) { +} +#endif + std::string BrowserContext::GetMediaDeviceIDSalt() { return UniqueId(); } diff --git a/chromium/content/public/browser/browser_context.h b/chromium/content/public/browser/browser_context.h index 96cd097d9e5..81fba2e18c2 100644 --- a/chromium/content/public/browser/browser_context.h +++ b/chromium/content/public/browser/browser_context.h @@ -17,7 +17,6 @@ #include "base/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/supports_user_data.h" -#include "components/spellcheck/spellcheck_buildflags.h" #include "content/common/content_export.h" #include "content/public/browser/k_anonymity_service_delegate.h" #include "content/public/browser/zoom_level_delegate.h" @@ -403,9 +402,9 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { // Default implementation uses the BrowserContext's UniqueId. virtual std::string GetMediaDeviceIDSalt(); -#if defined(TOOLKIT_QT) && BUILDFLAG(ENABLE_SPELLCHECK) +#if defined(TOOLKIT_QT) // Inform about not working dictionary for given language - virtual void FailedToLoadDictionary(const std::string& language) = 0; + virtual void FailedToLoadDictionary(const std::string& language); #endif // Returns the FileSystemAccessPermissionContext associated with this context |