Add error description to the DidFailProvisionalLoad callback.

content/renderer/render_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 1233 matching lines @@
       routing_id_, url, referrer, NavigationPolicyToDisposition(policy)));
 }
 
 // WebViewDelegate ------------------------------------------------------------
 
 void RenderView::LoadNavigationErrorPage(WebFrame* frame,
                                          const WebURLRequest& failed_request,
                                          const WebURLError& error,
                                          const std::string& html,
                                          bool replace) {
-  std::string alt_html = !html.empty() ? html :
-      content::GetContentClient()->renderer()->GetNavigationErrorHtml(
-          failed_request, error);
-  frame->loadHTMLString(alt_html,
+  std::string alt_html;
+  const std::string* error_html;
+
+  if (!html.empty())

[mmenke, 2011/10/07 14:19:44]

nit:  Use brackets here, too, since you use them with the else block.

[mkosiba (inactive), 2011/10/07 15:46:11]

Done.

+    error_html = &html;
+  else {
+    content::GetContentClient()->renderer()->GetNavigationErrorStrings(
+        failed_request, error, &alt_html, NULL);
+    error_html = &alt_html;
+  }
+
+  frame->loadHTMLString(*error_html,
                         GURL(chrome::kUnreachableWebDataURL),
                         error.unreachableURL,
                         replace);
 }
 
 bool RenderView::RunJavaScriptMessage(int type,
                                       const string16& message,
                                       const string16& default_value,
                                       const GURL& frame_url,
                                       string16* result) {
@@ skipping 1065 matching lines @@
   DCHECK(ds);
 
   const WebURLRequest& failed_request = ds->request();
 
   FOR_EACH_OBSERVER(
       RenderViewObserver, observers_, DidFailProvisionalLoad(frame, error));
 
   bool show_repost_interstitial =
       (error.reason == net::ERR_CACHE_MISS &&
        EqualsASCII(failed_request.httpMethod(), "POST"));
+
+  ViewHostMsg_DidFailProvisionalLoadWithError_Params ipc_params;
+  ipc_params.frame_id = frame->identifier();
+  ipc_params.is_main_frame = !frame->parent();
+  ipc_params.error_code = error.reason;
+  content::GetContentClient()->renderer()->GetNavigationErrorStrings(
+      failed_request,
+      error,
+      NULL,
+      &ipc_params.error_description);
+  ipc_params.url = error.unreachableURL;
+  ipc_params.showing_repost_interstitial = show_repost_interstitial;
   Send(new ViewHostMsg_DidFailProvisionalLoadWithError(
-      routing_id_, frame->identifier(), !frame->parent(), error.reason,
-      error.unreachableURL, show_repost_interstitial));
+      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.
   if (error.reason == net::ERR_ABORTED)
     return;
 
   // Make sure we never show errors in view source mode.
   frame->enableViewSourceMode(false);
 
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
@@ skipping 2045 matching lines @@
   main_frame->enableViewSourceMode(true);
 }
 
 void RenderView::OnLockMouseACK(bool succeeded) {
   pepper_delegate_.OnLockMouseACK(succeeded);
 }
 
 void RenderView::OnMouseLockLost() {
   pepper_delegate_.OnMouseLockLost();
 }
-