summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/shell_content_renderer_client.cc7
-rw-r--r--content/shell/shell_content_renderer_client.h6
2 files changed, 8 insertions, 5 deletions
diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/shell_content_renderer_client.cc
index 0c5f499..ab6ad0d 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() {
diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/shell_content_renderer_client.h
index aa8011a..43f1151 100644
--- a/content/shell/shell_content_renderer_client.h
+++ b/content/shell/shell_content_renderer_client.h
@@ -26,9 +26,11 @@ class ShellContentRendererClient : public ContentRendererClient {
WebKit::WebPlugin** plugin) OVERRIDE;
virtual bool HasErrorPage(int http_status_code,
std::string* error_domain) 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,