diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-10-08 15:42:00 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-12-11 20:51:04 +0100 |
| commit | b6d044eef72830d8d782995b43d64ca58e11cea0 (patch) | |
| tree | 64e79a86805a39c993329c1991bb9486e1b72dff /src/core/renderer/content_renderer_client_qt.cpp | |
| parent | 516b7f310d12e1ab844e314b0f2a98096f872f16 (diff) | |
Minor. RenderThreadObserverQt is really a RenderConfiguration
Follow same naming as in UserResourceController, which also implements
RenderThreadObserver.
Change-Id: I8a8386e6fb9fcc52826da1d0eef6efa97fd475e9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/renderer/content_renderer_client_qt.cpp')
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index a762c6fbb..bd1710009 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -84,7 +84,7 @@ #include "common/qt_messages.h" #include "renderer/render_frame_observer_qt.h" #include "renderer/render_view_observer_qt.h" -#include "renderer/render_thread_observer_qt.h" +#include "renderer/render_configuration.h" #include "renderer/user_resource_controller.h" #if QT_CONFIG(webengine_webchannel) #include "renderer/web_channel_ipc_transport.h" @@ -133,12 +133,12 @@ ContentRendererClientQt::~ContentRendererClientQt() {} void ContentRendererClientQt::RenderThreadStarted() { content::RenderThread *renderThread = content::RenderThread::Get(); - m_renderThreadObserver.reset(new RenderThreadObserverQt()); + m_renderConfiguration.reset(new RenderConfiguration()); m_userResourceController.reset(new UserResourceController()); m_visitedLinkReader.reset(new visitedlink::VisitedLinkReader); m_webCacheImpl.reset(new web_cache::WebCacheImpl()); - renderThread->AddObserver(m_renderThreadObserver.data()); + renderThread->AddObserver(m_renderConfiguration.data()); renderThread->AddObserver(m_userResourceController.data()); #if QT_CONFIG(webengine_spellchecker) @@ -306,10 +306,11 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF // NetErrorHelper::GetErrorStringsForDnsProbe, but that one is harder to untangle. error_page::LocalizedError::PageState errorPageState = - error_page::LocalizedError::GetPageState( - error.reason(), error.domain(), error.url(), isPost, - false, error.stale_copy_in_cache(), false, RenderThreadObserverQt::is_incognito_process(), false, - false, false, locale, std::unique_ptr<error_page::ErrorPageParams>()); + error_page::LocalizedError::GetPageState( + error.reason(), error.domain(), error.url(), isPost, false, + error.stale_copy_in_cache(), false, + RenderConfiguration::is_incognito_process(), false, false, false, locale, + std::unique_ptr<error_page::ErrorPageParams>()); resourceId = IDR_NET_ERROR_HTML; |