diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-08 01:40:13 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-08 01:40:13 +0000 |
| commit | e6a2ce57d998f2e436d584c264efb3d02b06018e (patch) | |
| tree | 75e4703b676dc48880090865834364ea844360a4 /content/shell | |
| parent | a813c8e4868ecd41fe76a387b9a5a92a2f7fe67c (diff) | |
| download | chromium_src-e6a2ce57d998f2e436d584c264efb3d02b06018e.zip chromium_src-e6a2ce57d998f2e436d584c264efb3d02b06018e.tar.gz chromium_src-e6a2ce57d998f2e436d584c264efb3d02b06018e.tar.bz2 | |
Simplify embedder API around showing custom error pages so that the embedder doesn't have to call content back in its callback. This removes one method from RenderView that we need to expose in its API.
BUG=98716
Review URL: http://codereview.chromium.org/8198021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_content_renderer_client.cc | 6 | ||||
| -rw-r--r-- | content/shell/shell_content_renderer_client.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/shell_content_renderer_client.cc index ea94b90..0c5f499 100644 --- a/content/shell/shell_content_renderer_client.cc +++ b/content/shell/shell_content_renderer_client.cc @@ -36,9 +36,9 @@ bool ShellContentRendererClient::OverrideCreatePlugin( return false; } -void ShellContentRendererClient::ShowErrorPage(RenderView* render_view, - WebKit::WebFrame* frame, - int http_status_code) { +bool ShellContentRendererClient::HasErrorPage(int http_status_code, + std::string* error_domain) { + return false; } std::string ShellContentRendererClient::GetNavigationErrorHtml( diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/shell_content_renderer_client.h index 05449ee..aa8011a 100644 --- a/content/shell/shell_content_renderer_client.h +++ b/content/shell/shell_content_renderer_client.h @@ -24,9 +24,8 @@ class ShellContentRendererClient : public ContentRendererClient { WebKit::WebFrame* frame, const WebKit::WebPluginParams& params, WebKit::WebPlugin** plugin) OVERRIDE; - virtual void ShowErrorPage(RenderView* render_view, - WebKit::WebFrame* frame, - int http_status_code) OVERRIDE; + virtual bool HasErrorPage(int http_status_code, + std::string* error_domain) OVERRIDE; virtual std::string GetNavigationErrorHtml( const WebKit::WebURLRequest& failed_request, const WebKit::WebURLError& error) OVERRIDE; |