| 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,
|
|
|