Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: content/shell/shell_content_renderer_client.cc

Issue 8142032: Add error description to the DidFailProvisionalLoad callback. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: removed unnecessary change Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/shell_content_renderer_client.cc
diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/shell_content_renderer_client.cc
index ea94b90d30a49273ae03b89730ac1c6ab0cab3ad..d3c7ed6837fe20202b75643dc080d9f7af2ff9e3 100644
--- a/content/shell/shell_content_renderer_client.cc
+++ b/content/shell/shell_content_renderer_client.cc
@@ -41,10 +41,15 @@ void ShellContentRendererClient::ShowErrorPage(RenderView* render_view,
int http_status_code) {
}
-std::string ShellContentRendererClient::GetNavigationErrorHtml(
- const WebKit::WebURLRequest& failed_request,
- const WebKit::WebURLError& error) {
- return std::string();
+void ShellContentRendererClient::GetNavigationErrorStrings(
+ const WebKit::WebURLRequest& failed_request,
+ const WebKit::WebURLError& error,
+ std::string* error_html,
+ string16* error_description) {
+ if (NULL != error_html)
+ *error_html = std::string();
mmenke 2011/10/07 14:19:44 nit: Should be indenting only 2 here, not 4.
mkosiba (inactive) 2011/10/07 15:46:11 Done.
+ if (NULL != error_description)
+ *error_description = string16();
}
bool ShellContentRendererClient::RunIdleHandlerWhenWidgetsHidden() {
« content/renderer/render_view.cc ('K') | « content/shell/shell_content_renderer_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698