New network error page: Fix resubmit warning page

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 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 "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 810 matching lines @@
   return true;
 }
 
 void ChromeContentRendererClient::GetNavigationErrorStrings(
     const WebKit::WebURLRequest& failed_request,
     const WebKit::WebURLError& error,
     std::string* error_html,
     string16* error_description) {
   const GURL failed_url = error.unreachableURL;
   const Extension* extension = NULL;
-  const bool is_repost =
-      error.reason == net::ERR_CACHE_MISS &&
-      error.domain == WebString::fromUTF8(net::kErrorDomain) &&
-      EqualsASCII(failed_request.httpMethod(), "POST");
 
   if (failed_url.is_valid() &&
       !failed_url.SchemeIs(extensions::kExtensionScheme)) {
     extension = extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
         ExtensionURLInfo(failed_url));
   }
 
+  bool is_post = EqualsASCII(failed_request.httpMethod(), "POST");

[eroman, 2013/04/16 00:22:49]

Is this guaranteed to be upper case?

[mmenke, 2013/04/16 14:46:18]

Per RFC 2616, the method is actually case sensitive.  So if it's actually a
POST, either it violates spec, or it is guaranteed to be upper case.

+
   if (error_html) {
     // Use a local error page.
     int resource_id;
     DictionaryValue error_strings;
     if (extension && !extension->from_bookmark()) {
       LocalizedError::GetAppErrorStrings(error, failed_url, extension,
                                          &error_strings);
 
       // TODO(erikkay): Should we use a different template for different
       // error messages?
       resource_id = IDR_ERROR_APP_HTML;
     } else {
-      if (is_repost) {
-        LocalizedError::GetFormRepostStrings(failed_url, &error_strings);
-      } else {
-        LocalizedError::GetStrings(error, &error_strings,
-                                   RenderThread::Get()->GetLocale());
-      }
+      LocalizedError::GetStrings(
+          error,
+          is_post,
+          RenderThread::Get()->GetLocale(),
+          &error_strings);
       resource_id = IDR_NET_ERROR_HTML;
     }
 
     const base::StringPiece template_html(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             resource_id));
     if (template_html.empty()) {
       NOTREACHED() << "unable to load template. ID: " << resource_id;
     } else {
       // "t" is the id of the templates root node.
       *error_html = webui::GetTemplatesHtml(template_html, &error_strings, "t");
     }
   }
 
   if (error_description) {
-    if (!extension && !is_repost)
-      *error_description = LocalizedError::GetErrorDetails(error);
+    if (!extension)
+      *error_description = LocalizedError::GetErrorDetails(error, is_post);
   }
 }
 
 bool ChromeContentRendererClient::RunIdleHandlerWhenWidgetsHidden() {
   return !extension_dispatcher_->is_extension_process();
 }
 
 bool ChromeContentRendererClient::AllowPopup() {
   extensions::ChromeV8Context* current_context =
       extension_dispatcher_->v8_context_set().GetCurrent();
@@ skipping 345 matching lines @@
 
   for (size_t i = 0; i < request_os_file_handle_allowed_hosts_.size(); ++i) {
     if (MatchPattern(inner.host(), request_os_file_handle_allowed_hosts_[i]))
       return true;
   }
 
   return false;
 }
 
 }  // namespace chrome