diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/browser_context_adapter.cpp | 9 | ||||
-rw-r--r-- | src/core/browser_context_qt.cpp | 20 | ||||
-rw-r--r-- | src/core/browser_context_qt.h | 2 |
3 files changed, 7 insertions, 24 deletions
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index e0f933562..fe667c570 100644 --- a/src/core/browser_context_adapter.cpp +++ b/src/core/browser_context_adapter.cpp @@ -466,15 +466,6 @@ void BrowserContextAdapter::clearHttpCache() m_browserContext->url_request_getter_->clearHttpCache(); } -QStringList BrowserContextAdapter::spellCheckLanguages(const QStringList &acceptLanguages) -{ -#if defined(ENABLE_SPELLCHECK) - return m_browserContext->spellCheckLanguages(acceptLanguages); -#else - return QStringList(); -#endif -} - void BrowserContextAdapter::setSpellCheckLanguage(const QString &language) { #if defined(ENABLE_SPELLCHECK) diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp index 5b3115530..e76222d48 100644 --- a/src/core/browser_context_qt.cpp +++ b/src/core/browser_context_qt.cpp @@ -47,6 +47,7 @@ #include "ssl_host_state_delegate_qt.h" #include "type_conversion.h" #include "url_request_context_getter_qt.h" +#include "web_engine_library_info.h" #include "base/time/time.h" #include "content/public/browser/browser_thread.h" @@ -54,6 +55,7 @@ #include "net/proxy/proxy_config_service.h" #if defined(ENABLE_SPELLCHECK) +#include "base/base_paths.h" #include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" #include "base/prefs/testing_pref_store.h" @@ -201,22 +203,12 @@ net::URLRequestContextGetter *BrowserContextQt::CreateRequestContext(content::Pr return url_request_getter_.get(); } - #if defined(ENABLE_SPELLCHECK) -QStringList BrowserContextQt::spellCheckLanguages(const QStringList& acceptedLanguages) +void BrowserContextQt::failedToLoadDictionary(const std::string &language) { - QStringList result; -#if !defined(OS_MACOSX) // no SpellcheckService::GetSpellCheckLanguages - m_prefService->SetString(prefs::kAcceptLanguages,acceptedLanguages.join(",").toStdString()); - - std::vector<std::string> vec; - SpellcheckService::GetSpellCheckLanguages(this, &vec); - - for (std::vector<std::string>::iterator it = vec.begin(); it != vec.end(); ++it) { - result << QString::fromStdString(*it); - } -#endif - return result; + Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + qWarning() << "Could not load dictionary for:" << toQt(language) << endl + << "Make sure that correct bdic file is in:" << toQt(WebEngineLibraryInfo::getPath(base::DIR_APP_DICTIONARIES).value()); } void BrowserContextQt::setSpellCheckLanguage(const QString &language) diff --git a/src/core/browser_context_qt.h b/src/core/browser_context_qt.h index 08ac05fd4..e2156f147 100644 --- a/src/core/browser_context_qt.h +++ b/src/core/browser_context_qt.h @@ -92,7 +92,7 @@ public: BrowserContextAdapter *adapter() { return m_adapter; } #if defined(ENABLE_SPELLCHECK) - QStringList spellCheckLanguages(const QStringList &acceptLanguages); + void failedToLoadDictionary(const std::string& language) override; void setSpellCheckLanguage(const QString &language); QString spellCheckLanguage() const; void setSpellCheckEnabled(bool enabled); |