summaryrefslogtreecommitdiffstats
path: root/content/renderer/mock_content_renderer_client.cc
diff options
context:
space:
mode:
authormkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 15:31:58 +0000
committermkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 15:31:58 +0000
commitd7b175e8762301a1bfca9d17681111bbf5bf5c0a (patch)
tree3dbd962ef0417f8977eebfd362ee5ffbcb5c1e27 /content/renderer/mock_content_renderer_client.cc
parentc2ee7f0e04e752bd40b1461e92756e7a320e40ec (diff)
downloadchromium_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/renderer/mock_content_renderer_client.cc')
-rw-r--r--content/renderer/mock_content_renderer_client.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/content/renderer/mock_content_renderer_client.cc b/content/renderer/mock_content_renderer_client.cc
index eef7981..984afa9 100644
--- a/content/renderer/mock_content_renderer_client.cc
+++ b/content/renderer/mock_content_renderer_client.cc
@@ -42,10 +42,11 @@ bool MockContentRendererClient::HasErrorPage(int http_status_code,
return false;
}
-std::string MockContentRendererClient::GetNavigationErrorHtml(
+void MockContentRendererClient::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 MockContentRendererClient::RunIdleHandlerWhenWidgetsHidden() {