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

Unified Diff: content/renderer/render_view.cc

Issue 8142032: Add error description to the DidFailProvisionalLoad callback. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: 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/renderer/render_view.cc
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 91d9c2d1b830ccf86ef71d2eb6598593e6043699..dbe2b9cc128e411b75c9307e83aec39ec9bc6e31 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -2340,9 +2340,19 @@ void RenderView::didFailProvisionalLoad(WebFrame* frame,
bool show_repost_interstitial =
(error.reason == net::ERR_CACHE_MISS &&
EqualsASCII(failed_request.httpMethod(), "POST"));
- Send(new ViewHostMsg_DidFailProvisionalLoadWithError(
- routing_id_, frame->identifier(), !frame->parent(), error.reason,
- error.unreachableURL, show_repost_interstitial));
+
+ {
jam 2011/10/05 17:12:06 nit: adding an extra scope here is unnecessary. we
mkosiba (inactive) 2011/10/05 17:53:18 Done.
+ ViewHostMsg_DidFailProvisionalLoadWithError_Params ipc_params;
+ ipc_params.frame_id = frame->identifier();
+ ipc_params.is_main_frame = !frame->parent();
+ ipc_params.error_code = error.reason;
+ ipc_params.error_description = content::GetContentClient()->renderer()->
+ GetNavigationErrorDescription(failed_request, error);
+ ipc_params.url = error.unreachableURL;
+ ipc_params.showing_repost_interstitial = show_repost_interstitial;
+ Send(new ViewHostMsg_DidFailProvisionalLoadWithError(
+ routing_id_, ipc_params));
+ }
// Don't display an error page if this is simply a cancelled load. Aside
// from being dumb, WebCore doesn't expect it and it will cause a crash.
@@ -4408,4 +4418,3 @@ void RenderView::OnLockMouseACK(bool succeeded) {
void RenderView::OnMouseLockLost() {
pepper_delegate_.OnMouseLockLost();
}
-

Powered by Google App Engine
This is Rietveld 408576698