summaryrefslogtreecommitdiffstats
path: root/src/core/renderer/content_renderer_client_qt.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-20 14:17:47 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-10 10:26:38 +0200
commit9cfde2edf4736ae9533e7e1fac495a23ad905419 (patch)
tree4eca639f54719a8824a527ee6a40fb13b462b110 /src/core/renderer/content_renderer_client_qt.cpp
parent0a01998411de6a46af8d0b0ae13b8f401cd14a4b (diff)
Adaptations for Chromium 75
Change-Id: Idad08244e0c749a9f70f5eb9f8cd236039b941b3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/renderer/content_renderer_client_qt.cpp')
-rw-r--r--src/core/renderer/content_renderer_client_qt.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 5fd4c7d65..092e6845d 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -280,33 +280,33 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF
if (errorHtml) {
// Use a local error page.
int resourceId;
- base::DictionaryValue errorStrings;
const std::string locale = content::RenderThread::Get()->GetLocale();
// TODO(elproxy): We could potentially get better diagnostics here by first calling
// NetErrorHelper::GetErrorStringsForDnsProbe, but that one is harder to untangle.
- error_page::LocalizedError::GetStrings(
- error.reason(), error.domain(), error.url(), isPost,
- error.stale_copy_in_cache(), false, RenderThreadObserverQt::is_incognito_process(),
- error_page::LocalizedError::OfflineContentOnNetErrorFeatureState::kDisabled,
- false, locale, std::unique_ptr<error_page::ErrorPageParams>(), &errorStrings);
+ error_page::LocalizedError::PageState errorPageState =
+ error_page::LocalizedError::GetPageState(
+ error.reason(), error.domain(), error.url(), isPost,
+ error.stale_copy_in_cache(), false, RenderThreadObserverQt::is_incognito_process(), false,
+ false, locale, std::unique_ptr<error_page::ErrorPageParams>());
+
resourceId = IDR_NET_ERROR_HTML;
const base::StringPiece template_html(ui::ResourceBundle::GetSharedInstance().GetRawDataResource(resourceId));
if (template_html.empty())
NOTREACHED() << "unable to load template. ID: " << resourceId;
else // "t" is the id of the templates root node.
- *errorHtml = webui::GetTemplatesHtml(template_html, &errorStrings, "t");
+ *errorHtml = webui::GetTemplatesHtml(template_html, &errorPageState.strings, "t");
}
}
-unsigned long long ContentRendererClientQt::VisitedLinkHash(const char *canonicalUrl, size_t length)
+uint64_t ContentRendererClientQt::VisitedLinkHash(const char *canonicalUrl, size_t length)
{
return m_visitedLinkSlave->ComputeURLFingerprint(canonicalUrl, length);
}
-bool ContentRendererClientQt::IsLinkVisited(unsigned long long linkHash)
+bool ContentRendererClientQt::IsLinkVisited(uint64_t linkHash)
{
return m_visitedLinkSlave->IsVisited(linkHash);
}