| 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 0c5f499fbad8d2b7f7b2dd6a0af5c399141831b4..ab6ad0d8961e3fda8aae2eb476e48145b3fb91a2 100644
|
| --- a/content/shell/shell_content_renderer_client.cc
|
| +++ b/content/shell/shell_content_renderer_client.cc
|
| @@ -41,10 +41,11 @@ bool ShellContentRendererClient::HasErrorPage(int http_status_code,
|
| return false;
|
| }
|
|
|
| -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) {
|
| }
|
|
|
| bool ShellContentRendererClient::RunIdleHandlerWhenWidgetsHidden() {
|
|
|