diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-05-11 13:43:45 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-07-02 04:33:41 +0000 |
| commit | 42504596248a10eb31a5b719e0676b71f55871e4 (patch) | |
| tree | e7f1008595bb417e2b92bcfbb5bf4c0eb71196bf /src/core/browser_context_adapter.cpp | |
| parent | 1e204d3b74fbe275fb4d9fe45bbb011742f828f9 (diff) | |
Add back spellchecking support
This reverts commit:
* d364c05de52f9ab39034e56cac4e0a7981dc541d
* e507f140b70f464fb970d2f94357ac588dcc4f03
Moreover it fixes shut down of keyed services,
updates versioning of and fixes spellcheck unit
test context menu request, which otherwise
fails on windows.
Change-Id: I9bfc589544cb969abd6d2d7af69531b4c5c907b7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/browser_context_adapter.cpp')
| -rw-r--r-- | src/core/browser_context_adapter.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index 6563c017f..57afb7c33 100644 --- a/src/core/browser_context_adapter.cpp +++ b/src/core/browser_context_adapter.cpp @@ -53,6 +53,10 @@ #include "net/proxy/proxy_service.h" +#if defined(ENABLE_SPELLCHECK) +#include "components/keyed_service/content/browser_context_dependency_manager.h" +#endif + #include <QCoreApplication> #include <QDir> #include <QString> @@ -100,6 +104,12 @@ BrowserContextAdapter::~BrowserContextAdapter() { if (m_downloadManagerDelegate) content::BrowserThread::DeleteSoon(content::BrowserThread::UI, FROM_HERE, m_downloadManagerDelegate.take()); +#if defined(ENABLE_SPELLCHECK) + // Please note spellchecker is the only keyed service we use so far, therefore + // remove this check if there are other serivces also used. + BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( + m_browserContext.data()); +#endif } void BrowserContextAdapter::setStorageName(const QString &storageName) |