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/renderer | |
| 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/renderer')
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 12 | ||||
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.h | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index 63b99c7bc..2c3ea4cc3 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -184,18 +184,18 @@ bool ContentRendererClientQt::ShouldSuppressErrorPage(content::RenderFrame *fram } // To tap into the chromium localized strings. Ripped from the chrome layer (highly simplified). -void ContentRendererClientQt::GetNavigationErrorStrings(content::RenderFrame* renderFrame, const blink::WebURLRequest &failedRequest, - const blink::WebURLError &web_error, - std::string *errorHtml, base::string16 *errorDescription) +void ContentRendererClientQt::PrepareErrorPage(content::RenderFrame* renderFrame, const blink::WebURLRequest &failedRequest, + const blink::WebURLError &web_error, + std::string *errorHtml, base::string16 *errorDescription) { GetNavigationErrorStringsInternal(renderFrame, failedRequest, error_page::Error::NetError(web_error.url(), web_error.reason(), web_error.has_copy_in_cache()), errorHtml, errorDescription); } -void ContentRendererClientQt::GetNavigationErrorStringsForHttpStatusError(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest, - const GURL& unreachable_url, int http_status, - std::string* errorHtml, base::string16* errorDescription) +void ContentRendererClientQt::PrepareErrorPageForHttpStatusError(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest, + const GURL& unreachable_url, int http_status, + std::string* errorHtml, base::string16* errorDescription) { GetNavigationErrorStringsInternal(renderFrame, failedRequest, error_page::Error::HttpError(unreachable_url, http_status), diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h index 11538b3f0..b91f57fc2 100644 --- a/src/core/renderer/content_renderer_client_qt.h +++ b/src/core/renderer/content_renderer_client_qt.h @@ -74,11 +74,11 @@ public: void RenderFrameCreated(content::RenderFrame* render_frame) override; bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) override; bool HasErrorPage(int http_status_code) override; - void GetNavigationErrorStrings(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest, - const blink::WebURLError& error, std::string* errorHtml, base::string16* errorDescription) override; - void GetNavigationErrorStringsForHttpStatusError(content::RenderFrame* render_frame, const blink::WebURLRequest& failed_request, - const GURL& unreachable_url, int http_status, - std::string* error_html, base::string16* error_description) override; + void PrepareErrorPage(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest, + const blink::WebURLError& error, std::string* errorHtml, base::string16* errorDescription) override; + void PrepareErrorPageForHttpStatusError(content::RenderFrame* render_frame, const blink::WebURLRequest& failed_request, + const GURL& unreachable_url, int http_status, + std::string* error_html, base::string16* error_description) override; unsigned long long VisitedLinkHash(const char *canonicalUrl, size_t length) override; bool IsLinkVisited(unsigned long long linkHash) override; |