From 521c3f6c47e3e7e284eaaca40c1820fbcb1b56e0 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 1 Aug 2016 11:33:04 +0200 Subject: Make UserPrefs available without spell-checking Autofill and other components also need user preferences, so make it included by default. Change-Id: Id63241b2239451456ca8a8e1cd9771df4d48b8b8 Reviewed-by: Kai Koehne --- src/core/browser_context_adapter.cpp | 9 +-------- src/core/browser_context_qt.cpp | 11 +++-------- src/core/browser_context_qt.h | 4 ---- src/core/chrome_qt.gyp | 17 +++++++---------- src/core/qtwebengine.gypi | 7 +++++-- 5 files changed, 16 insertions(+), 32 deletions(-) diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index 03150d322..cf7987fa7 100644 --- a/src/core/browser_context_adapter.cpp +++ b/src/core/browser_context_adapter.cpp @@ -53,9 +53,7 @@ #include "net/proxy/proxy_service.h" -#if defined(ENABLE_SPELLCHECK) #include "components/keyed_service/content/browser_context_dependency_manager.h" -#endif #include #include @@ -104,12 +102,7 @@ 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 + BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(m_browserContext.data()); } void BrowserContextAdapter::setStorageName(const QString &storageName) diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp index 7ca1c6477..42993207d 100644 --- a/src/core/browser_context_qt.cpp +++ b/src/core/browser_context_qt.cpp @@ -54,7 +54,6 @@ #include "content/public/browser/storage_partition.h" #include "net/proxy/proxy_config_service.h" -#if defined(ENABLE_SPELLCHECK) #include "base/base_paths.h" #include "components/prefs/pref_member.h" #include "components/prefs/pref_service.h" @@ -63,13 +62,13 @@ #include "components/prefs/pref_service_factory.h" #include "components/prefs/pref_registry_simple.h" #include "components/user_prefs/user_prefs.h" +#if defined(ENABLE_SPELLCHECK) #include "chrome/common/pref_names.h" #include "chrome/browser/spellchecker/spellcheck_service.h" #endif namespace QtWebEngineCore { -#if defined(ENABLE_SPELLCHECK) BrowserContextQt::BrowserContextQt(BrowserContextAdapter *adapter) : m_adapter(adapter), m_prefStore(new TestingPrefStore()) @@ -79,6 +78,7 @@ BrowserContextQt::BrowserContextQt(BrowserContextAdapter *adapter) factory.set_user_prefs(m_prefStore); scoped_refptr registry(new PrefRegistrySimple()); +#if defined(ENABLE_SPELLCHECK) // Initial spellcheck settings registry->RegisterListPref(prefs::kSpellCheckDictionaries, new base::ListValue()); registry->RegisterStringPref(prefs::kAcceptLanguages, std::string()); @@ -86,15 +86,10 @@ BrowserContextQt::BrowserContextQt(BrowserContextAdapter *adapter) registry->RegisterBooleanPref(prefs::kSpellCheckUseSpellingService, false); registry->RegisterBooleanPref(prefs::kEnableContinuousSpellcheck, false); registry->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, false); +#endif //ENABLE_SPELLCHECK m_prefService = factory.Create(std::move(registry.get())); user_prefs::UserPrefs::Set(this, m_prefService.get()); } -#else -BrowserContextQt::BrowserContextQt(BrowserContextAdapter *adapter) - : m_adapter(adapter) -{ -} -#endif //ENABLE_SPELLCHECK BrowserContextQt::~BrowserContextQt() { diff --git a/src/core/browser_context_qt.h b/src/core/browser_context_qt.h index 13f7220bd..982f9a764 100644 --- a/src/core/browser_context_qt.h +++ b/src/core/browser_context_qt.h @@ -47,13 +47,11 @@ #include // Needed for Q_DECL_OVERRIDE -#if defined(ENABLE_SPELLCHECK) QT_BEGIN_NAMESPACE class QStringList; QT_END_NAMESPACE class TestingPrefStore; class PrefService; -#endif namespace QtWebEngineCore { @@ -112,10 +110,8 @@ private: scoped_ptr permissionManager; scoped_ptr sslHostStateDelegate; BrowserContextAdapter *m_adapter; -#if defined(ENABLE_SPELLCHECK) scoped_refptr m_prefStore; scoped_ptr m_prefService; -#endif friend class BrowserContextAdapter; DISALLOW_COPY_AND_ASSIGN(BrowserContextQt); diff --git a/src/core/chrome_qt.gyp b/src/core/chrome_qt.gyp index d2dfb5a7b..e5486498a 100644 --- a/src/core/chrome_qt.gyp +++ b/src/core/chrome_qt.gyp @@ -2,8 +2,6 @@ 'variables': { 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'chrome_spellchecker_sources': [ - '<(DEPTH)/components/prefs/testing_pref_store.cc', - '<(DEPTH)/components/prefs/testing_pref_store.h', '<(DEPTH)/chrome/browser/spellchecker/feedback.cc', '<(DEPTH)/chrome/browser/spellchecker/feedback.h', '<(DEPTH)/chrome/browser/spellchecker/feedback_sender.cc', @@ -78,6 +76,8 @@ '<(DEPTH)/chrome/browser/media/desktop_streams_registry.h', '<(DEPTH)/chrome/common/chrome_switches.cc', '<(DEPTH)/chrome/common/chrome_switches.h', + '<(DEPTH)/components/prefs/testing_pref_store.cc', + '<(DEPTH)/components/prefs/testing_pref_store.h', '<(DEPTH)/extensions/common/constants.cc', '<(DEPTH)/extensions/common/constants.h', '<(DEPTH)/extensions/common/url_pattern.cc', @@ -99,16 +99,13 @@ ['enable_spellcheck==1', { 'sources': [ '<@(chrome_spellchecker_sources)' ], 'include_dirs': [ - '<(chromium_src_dir)/third_party/WebKit', + '<(chromium_src_dir)/third_party/WebKit', ], 'dependencies': [ - '<(chromium_src_dir)/components/components.gyp:keyed_service_content', - '<(chromium_src_dir)/components/components.gyp:keyed_service_core', - '<(chromium_src_dir)/components/components.gyp:pref_registry', - '<(chromium_src_dir)/components/components.gyp:user_prefs', - '<(chromium_src_dir)/third_party/hunspell/hunspell.gyp:hunspell', - '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n', - '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc', + '<(chromium_src_dir)/chrome/tools/convert_dict/convert_dict.gyp:convert_dict_lib', + '<(chromium_src_dir)/third_party/hunspell/hunspell.gyp:hunspell', + '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n', + '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc', ], 'defines': [ '__STDC_CONSTANT_MACROS', diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index 84a9ff564..6e44c5dc6 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -8,15 +8,18 @@ 'dependencies': [ '<(chromium_src_dir)/base/base.gyp:base', '<(chromium_src_dir)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '<(chromium_src_dir)/chrome/tools/convert_dict/convert_dict.gyp:convert_dict_lib', + '<(chromium_src_dir)/components/components.gyp:cdm_renderer', '<(chromium_src_dir)/components/components.gyp:devtools_discovery', '<(chromium_src_dir)/components/components.gyp:devtools_http_handler', '<(chromium_src_dir)/components/components.gyp:error_page_renderer', + '<(chromium_src_dir)/components/components.gyp:keyed_service_content', + '<(chromium_src_dir)/components/components.gyp:keyed_service_core', + '<(chromium_src_dir)/components/components.gyp:pref_registry', + '<(chromium_src_dir)/components/components.gyp:user_prefs', '<(chromium_src_dir)/components/components.gyp:visitedlink_browser', '<(chromium_src_dir)/components/components.gyp:visitedlink_renderer', '<(chromium_src_dir)/components/components.gyp:web_cache_browser', '<(chromium_src_dir)/components/components.gyp:web_cache_renderer', - '<(chromium_src_dir)/components/components.gyp:cdm_renderer', '<(chromium_src_dir)/content/content.gyp:content', '<(chromium_src_dir)/content/content.gyp:content_app_browser', '<(chromium_src_dir)/content/content.gyp:content_browser', -- cgit v1.2.3