diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-06-17 16:15:35 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2014-08-04 17:22:42 +0200 |
| commit | 7d90b44187cfa8f93df6a6341da41cf8192d18ad (patch) | |
| tree | 47384a6837549df6c80759ae270bbd8651477bde /src/core/renderer/content_renderer_client_qt.h | |
| parent | 35d66ce48248f07759cbe2a17437198e8e1948ed (diff) | |
Expose better error information in loadRequest.
Use the chromium localized error strings for that purpose, otherwise the
error description is always empty.
While we're at it, let's tap into the chromium error pages, which should
hopefully make sense for most errors, and add some static asserts to
check that the qt quick enum and the core one are in sync.
Change-Id: Icf8fa7c3bf4a674c60a10950422135fb6930447a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/renderer/content_renderer_client_qt.h')
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h index 100bfd703..360e82f2c 100644 --- a/src/core/renderer/content_renderer_client_qt.h +++ b/src/core/renderer/content_renderer_client_qt.h @@ -47,6 +47,7 @@ class ContentRendererClientQt : public content::ContentRendererClient { public: virtual void RenderViewCreated(content::RenderView *render_view) Q_DECL_OVERRIDE; - // Update this when we want to allow overriding error pages. - virtual bool ShouldSuppressErrorPage(const GURL &) Q_DECL_OVERRIDE { return true; } + virtual bool ShouldSuppressErrorPage(const GURL &) Q_DECL_OVERRIDE { return false; } + virtual void GetNavigationErrorStrings(blink::WebFrame* frame, const blink::WebURLRequest& failed_request, const blink::WebURLError& error + , const std::string& accept_languages, std::string* error_html, base::string16* error_description) Q_DECL_OVERRIDE; }; |