diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-11 15:31:58 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-11 15:31:58 +0000 |
| commit | d7b175e8762301a1bfca9d17681111bbf5bf5c0a (patch) | |
| tree | 3dbd962ef0417f8977eebfd362ee5ffbcb5c1e27 /content/shell | |
| parent | c2ee7f0e04e752bd40b1461e92756e7a320e40ec (diff) | |
| download | chromium_src-d7b175e8762301a1bfca9d17681111bbf5bf5c0a.zip chromium_src-d7b175e8762301a1bfca9d17681111bbf5bf5c0a.tar.gz chromium_src-d7b175e8762301a1bfca9d17681111bbf5bf5c0a.tar.bz2 | |
Add error description to the DidFailProvisionalLoad callback.
This will add an error description field to the TabContentsObserver::
DidFailProvisionalLoad callback.
The change should not have any impact on current behavior.
This is needed for the Chromium port on Android.
BUG=none
TEST=base_unittests,content_unittests,browser_tests
Review URL: http://codereview.chromium.org/8142032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_content_renderer_client.cc | 7 | ||||
| -rw-r--r-- | content/shell/shell_content_renderer_client.h | 6 |
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, |