diff options
| author | ellyjones@chromium.org <ellyjones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-10 22:45:30 +0000 |
|---|---|---|
| committer | ellyjones@chromium.org <ellyjones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-10 22:45:30 +0000 |
| commit | 24a57ccf8bafcd170c894ede9c41aa6207eb0906 (patch) | |
| tree | 7ff20c6e39e4e429b50c25243a294860763dcdca /content/public | |
| parent | 00bb6ccd8e02fa5a24d5902ec647928e1c7d3ea6 (diff) | |
| download | chromium_src-24a57ccf8bafcd170c894ede9c41aa6207eb0906.zip chromium_src-24a57ccf8bafcd170c894ede9c41aa6207eb0906.tar.gz chromium_src-24a57ccf8bafcd170c894ede9c41aa6207eb0906.tar.bz2 | |
Pass frame to ChromeContentRendererClient::ShouldSuppressErrorPage
Adding this parameter lets the same object act as an observer for multiple
RenderFrames.
BUG=329618
TEST=unit,trybot
Review URL: https://codereview.chromium.org/134183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/renderer/content_renderer_client.cc | 3 | ||||
| -rw-r--r-- | content/public/renderer/content_renderer_client.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc index 344cbe3..19324ed 100644 --- a/content/public/renderer/content_renderer_client.cc +++ b/content/public/renderer/content_renderer_client.cc @@ -37,7 +37,8 @@ bool ContentRendererClient::HasErrorPage(int http_status_code, return false; } -bool ContentRendererClient::ShouldSuppressErrorPage(const GURL& url) { +bool ContentRendererClient::ShouldSuppressErrorPage(RenderFrame* render_frame, + const GURL& url) { return false; } diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index 958d1fa..c01e3527 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -106,8 +106,9 @@ class CONTENT_EXPORT ContentRendererClient { std::string* error_domain); // Returns true if the embedder prefers not to show an error page for a failed - // navigation to |url|. - virtual bool ShouldSuppressErrorPage(const GURL& url); + // navigation to |url| in |render_frame|. + virtual bool ShouldSuppressErrorPage(RenderFrame* render_frame, + const GURL& url); // Returns the information to display when a navigation error occurs. // If |error_html| is not null then it may be set to a HTML page containing |