| Index: chrome/renderer/chrome_content_renderer_client.h
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
|
| index dca85ff561ad804b8e26f38728221aedcdbc5760..689d4c255e89345ea519ab1b41d88f575efa2bea 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.h
|
| +++ b/chrome/renderer/chrome_content_renderer_client.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/string16.h"
|
| #include "content/public/renderer/content_renderer_client.h"
|
|
|
| class ChromeRenderProcessObserver;
|
| @@ -50,9 +51,11 @@ class ChromeContentRendererClient : public content::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,
|
|
|