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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 13811022: New network error page: Fix resubmit warning page (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync prior to commit Created 7 years, 8 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
« no previous file with comments | « chrome/common/localized_error.cc ('k') | chrome/renderer/net/net_error_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc (revision 194509)
+++ chrome/renderer/chrome_content_renderer_client.cc (working copy)
@@ -828,10 +828,6 @@
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)) {
@@ -839,6 +835,8 @@
ExtensionURLInfo(failed_url));
}
+ bool is_post = EqualsASCII(failed_request.httpMethod(), "POST");
+
if (error_html) {
// Use a local error page.
int resource_id;
@@ -851,12 +849,11 @@
// 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;
}
@@ -872,8 +869,8 @@
}
if (error_description) {
- if (!extension && !is_repost)
- *error_description = LocalizedError::GetErrorDetails(error);
+ if (!extension)
+ *error_description = LocalizedError::GetErrorDetails(error, is_post);
}
}
« no previous file with comments | « chrome/common/localized_error.cc ('k') | chrome/renderer/net/net_error_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698