| Index: content/shell/shell_content_renderer_client.cc
|
| diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/shell_content_renderer_client.cc
|
| index ea94b90d30a49273ae03b89730ac1c6ab0cab3ad..4b9d698f828a13087f9f6599aa27c0fe0b793d7c 100644
|
| --- a/content/shell/shell_content_renderer_client.cc
|
| +++ b/content/shell/shell_content_renderer_client.cc
|
| @@ -41,10 +41,15 @@ void ShellContentRendererClient::ShowErrorPage(RenderView* render_view,
|
| int http_status_code) {
|
| }
|
|
|
| -std::string ShellContentRendererClient::GetNavigationErrorHtml(
|
| +void ShellContentRendererClient::GetNavigationErrorStrings(
|
| const WebKit::WebURLRequest& failed_request,
|
| - const WebKit::WebURLError& error) {
|
| - return std::string();
|
| + const WebKit::WebURLError& error,
|
| + std::string* error_html,
|
| + string16* error_description) {
|
| + if (error_html != NULL)
|
| + *error_html = std::string();
|
| + if (error_description != NULL)
|
| + *error_description = string16();
|
| }
|
|
|
| bool ShellContentRendererClient::RunIdleHandlerWhenWidgetsHidden() {
|
|
|