diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 12:19:37 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:24 +0000 |
commit | 6b35497375c07c49cca7317a4452acc6adc7a1cd (patch) | |
tree | 5531da6c89bb3da6495e8c83a0b86bff638f3baa /src/core/content_browser_client_qt.cpp | |
parent | 91e13af7e1056a7bad83eb34ebf63fdd45e24bea (diff) |
Basic adaptations for 65-based
Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 18d0ff1c9..fd1643a69 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -45,7 +45,7 @@ #include "base/threading/thread_restrictions.h" #include "components/spellcheck/spellcheck_build_features.h" #if BUILDFLAG(ENABLE_SPELLCHECK) -#include "chrome/browser/spellchecker/spell_check_host_impl.h" +#include "chrome/browser/spellchecker/spell_check_host_chrome_impl.h" #if BUILDFLAG(USE_BROWSER_SPELLCHECKER) #include "components/spellcheck/browser/spellcheck_message_filter_platform.h" #endif @@ -75,6 +75,7 @@ #include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/service.h" #include "third_party/WebKit/public/platform/modules/insecure_input/insecure_input_service.mojom.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_switches.h" #include "ui/display/screen.h" #include "ui/gl/gl_context.h" @@ -82,7 +83,7 @@ #include "ui/gl/gl_share_group.h" #include "ui/gl/gpu_timing.h" -#include "chrome/grit/qt_webengine_resources.h" +#include "qtwebengine/grit/qt_webengine_resources.h" #include "browser_context_adapter.h" #include "browser_context_qt.h" @@ -616,7 +617,7 @@ ServiceQt::ServiceQt() DCHECK_CURRENTLY_ON(content::BrowserThread::IO); #if BUILDFLAG(ENABLE_SPELLCHECK) m_registry_with_source_info.AddInterface( - base::Bind(&SpellCheckHostImpl::Create), + base::Bind(&SpellCheckHostChromeImpl::Create), content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::UI)); #endif } |