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

Side by Side Diff: trunk/src/chrome/renderer/net/net_error_helper.cc

Issue 14369002: Revert 194514 - New network error page: Fix resubmit warning page (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/chrome/renderer/net/net_error_helper.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/net/net_error_helper.h" 5 #include "chrome/renderer/net/net_error_helper.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/common/localized_error.h" 8 #include "chrome/common/localized_error.h"
9 #include "chrome/common/render_messages.h" 9 #include "chrome/common/render_messages.h"
10 #include "chrome/common/net/net_error_info.h" 10 #include "chrome/common/net/net_error_info.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } 94 }
95 95
96 } // namespace 96 } // namespace
97 97
98 NetErrorHelper::NetErrorHelper(RenderView* render_view) 98 NetErrorHelper::NetErrorHelper(RenderView* render_view)
99 : RenderViewObserver(render_view), 99 : RenderViewObserver(render_view),
100 ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(base::Bind( 100 ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(base::Bind(
101 &NetErrorHelper::TrackerCallback, 101 &NetErrorHelper::TrackerCallback,
102 base::Unretained(this)))), 102 base::Unretained(this)))),
103 dns_error_page_state_(NetErrorTracker::DNS_ERROR_PAGE_NONE), 103 dns_error_page_state_(NetErrorTracker::DNS_ERROR_PAGE_NONE),
104 updated_error_page_(false), 104 updated_error_page_(false) {
105 is_failed_post_(false) {
106 } 105 }
107 106
108 NetErrorHelper::~NetErrorHelper() { 107 NetErrorHelper::~NetErrorHelper() {
109 } 108 }
110 109
111 void NetErrorHelper::DidStartProvisionalLoad(WebKit::WebFrame* frame) { 110 void NetErrorHelper::DidStartProvisionalLoad(WebKit::WebFrame* frame) {
112 tracker_.OnStartProvisionalLoad(GetFrameType(frame), GetPageType(frame)); 111 tracker_.OnStartProvisionalLoad(GetFrameType(frame), GetPageType(frame));
113 } 112 }
114 113
115 void NetErrorHelper::DidFailProvisionalLoad(WebKit::WebFrame* frame, 114 void NetErrorHelper::DidFailProvisionalLoad(WebKit::WebFrame* frame,
116 const WebKit::WebURLError& error) { 115 const WebKit::WebURLError& error) {
117 WebKit::WebDataSource* data_source = frame->provisionalDataSource();
118 const WebKit::WebURLRequest& failed_request = data_source->request();
119 is_failed_post_ = EqualsASCII(failed_request.httpMethod(), "POST");
120 tracker_.OnFailProvisionalLoad(GetFrameType(frame), GetErrorType(error)); 116 tracker_.OnFailProvisionalLoad(GetFrameType(frame), GetErrorType(error));
121 } 117 }
122 118
123 void NetErrorHelper::DidCommitProvisionalLoad(WebKit::WebFrame* frame, 119 void NetErrorHelper::DidCommitProvisionalLoad(WebKit::WebFrame* frame,
124 bool is_new_navigation) { 120 bool is_new_navigation) {
125 tracker_.OnCommitProvisionalLoad(GetFrameType(frame)); 121 tracker_.OnCommitProvisionalLoad(GetFrameType(frame));
126 } 122 }
127 123
128 void NetErrorHelper::DidFinishLoad(WebKit::WebFrame* frame) { 124 void NetErrorHelper::DidFinishLoad(WebKit::WebFrame* frame) {
129 tracker_.OnFinishLoad(GetFrameType(frame)); 125 tracker_.OnFinishLoad(GetFrameType(frame));
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 DVLOG(1) << "Updating error page with result " << dns_probe_result; 173 DVLOG(1) << "Updating error page with result " << dns_probe_result;
178 174
179 int net_error = DnsProbeResultToNetError(dns_probe_result); 175 int net_error = DnsProbeResultToNetError(dns_probe_result);
180 if (net_error == net::OK) 176 if (net_error == net::OK)
181 return; 177 return;
182 178
183 DVLOG(1) << "net error code is " << net_error; 179 DVLOG(1) << "net error code is " << net_error;
184 180
185 DictionaryValue error_strings; 181 DictionaryValue error_strings;
186 LocalizedError::GetStrings(NetErrorToWebURLError(net_error), 182 LocalizedError::GetStrings(NetErrorToWebURLError(net_error),
187 is_failed_post_, 183 &error_strings,
188 RenderThread::Get()->GetLocale(), 184 RenderThread::Get()->GetLocale());
189 &error_strings);
190 185
191 // TODO(ttuttle): Update error page with error_strings. 186 // TODO(ttuttle): Update error page with error_strings.
192 } 187 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/renderer/net/net_error_helper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698