content/shell/shell_content_renderer_client.h - Issue 8142032: Add error description to the DidFailProvisionalLoad callback.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/shell_content_renderer_client.h

Issue 8142032: Add error description to the DidFailProvisionalLoad callback. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: incorporated feedback (style only, no functional changes) Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/shell/shell_content_renderer_client.h

diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/shell_content_renderer_client.h

index 05449ee4842383a9c49f33bba1e66ada6ba17729..d39bc184be10b504ac315f65c9b9cd193c1332f9 100644

--- a/content/shell/shell_content_renderer_client.h

+++ b/content/shell/shell_content_renderer_client.h

@@ -27,9 +27,11 @@ class ShellContentRendererClient : public ContentRendererClient {

virtual void ShowErrorPage(RenderView* render_view,

WebKit::WebFrame* frame,

int http_status_code) OVERRIDE;

- virtual std::string GetNavigationErrorHtml(

+ virtual void GetNavigationErrorStrings(

const WebKit::WebURLRequest& failed_request,

- const WebKit::WebURLError& error) OVERRIDE;

+ const WebKit::WebURLError& error,

+ std::string* error_html,

+ string16* error_description) OVERRIDE;

virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE;

virtual bool AllowPopup(const GURL& creator) OVERRIDE;

virtual bool ShouldFork(WebKit::WebFrame* frame,