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

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

Issue 136203009: Support auto-reload on errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: More fixes Created 6 years, 9 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
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 <string> 7 #include <string>
mmenke 2014/03/04 17:26:25 nit: Blank line after standard C++ header include
Elly Fong-Jones 2014/03/06 21:48:37 Done.
8 8 #include "base/command_line.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/common/chrome_switches.h"
13 #include "chrome/common/localized_error.h" 14 #include "chrome/common/localized_error.h"
14 #include "chrome/common/net/net_error_info.h" 15 #include "chrome/common/net/net_error_info.h"
15 #include "chrome/common/render_messages.h" 16 #include "chrome/common/render_messages.h"
17 #include "chrome/renderer/net/mockable_one_shot_timer.h"
16 #include "content/public/common/content_client.h" 18 #include "content/public/common/content_client.h"
17 #include "content/public/common/url_constants.h" 19 #include "content/public/common/url_constants.h"
18 #include "content/public/renderer/content_renderer_client.h" 20 #include "content/public/renderer/content_renderer_client.h"
19 #include "content/public/renderer/render_frame.h" 21 #include "content/public/renderer/render_frame.h"
20 #include "content/public/renderer/render_thread.h" 22 #include "content/public/renderer/render_thread.h"
21 #include "content/public/renderer/render_view.h" 23 #include "content/public/renderer/render_view.h"
22 #include "content/public/renderer/resource_fetcher.h" 24 #include "content/public/renderer/resource_fetcher.h"
23 #include "grit/renderer_resources.h" 25 #include "grit/renderer_resources.h"
24 #include "ipc/ipc_message.h" 26 #include "ipc/ipc_message.h"
25 #include "ipc/ipc_message_macros.h" 27 #include "ipc/ipc_message_macros.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 if (!frame->parent()) 62 if (!frame->parent())
61 return NetErrorHelperCore::MAIN_FRAME; 63 return NetErrorHelperCore::MAIN_FRAME;
62 return NetErrorHelperCore::SUB_FRAME; 64 return NetErrorHelperCore::SUB_FRAME;
63 } 65 }
64 66
65 } // namespace 67 } // namespace
66 68
67 NetErrorHelper::NetErrorHelper(RenderFrame* render_view) 69 NetErrorHelper::NetErrorHelper(RenderFrame* render_view)
68 : RenderFrameObserver(render_view), 70 : RenderFrameObserver(render_view),
69 content::RenderFrameObserverTracker<NetErrorHelper>(render_view), 71 content::RenderFrameObserverTracker<NetErrorHelper>(render_view),
70 core_(this) { 72 core_(this,
73 scoped_ptr<MockableOneShotTimer>(new MockableOneShotTimer())) {
74 RenderThread::Get()->AddObserver(this);
75 CommandLine* command_line = CommandLine::ForCurrentProcess();
76 bool auto_reload_enabled =
77 command_line->HasSwitch(switches::kEnableOfflineAutoReload);
78 core_.set_auto_reload_enabled(auto_reload_enabled);
71 } 79 }
72 80
73 NetErrorHelper::~NetErrorHelper() { 81 NetErrorHelper::~NetErrorHelper() {
82 RenderThread::Get()->RemoveObserver(this);
74 } 83 }
75 84
76 void NetErrorHelper::DidStartProvisionalLoad() { 85 void NetErrorHelper::DidStartProvisionalLoad() {
77 blink::WebFrame* frame = render_frame()->GetWebFrame(); 86 blink::WebFrame* frame = render_frame()->GetWebFrame();
78 core_.OnStartLoad(GetFrameType(frame), GetLoadingPageType(frame)); 87 core_.OnStartLoad(GetFrameType(frame), GetLoadingPageType(frame));
79 } 88 }
80 89
81 void NetErrorHelper::DidCommitProvisionalLoad(bool is_new_navigation) { 90 void NetErrorHelper::DidCommitProvisionalLoad(bool is_new_navigation) {
82 blink::WebFrame* frame = render_frame()->GetWebFrame(); 91 blink::WebFrame* frame = render_frame()->GetWebFrame();
83 core_.OnCommitLoad(GetFrameType(frame)); 92 core_.OnCommitLoad(GetFrameType(frame));
(...skipping 13 matching lines...) Expand all
97 106
98 IPC_BEGIN_MESSAGE_MAP(NetErrorHelper, message) 107 IPC_BEGIN_MESSAGE_MAP(NetErrorHelper, message)
99 IPC_MESSAGE_HANDLER(ChromeViewMsg_NetErrorInfo, OnNetErrorInfo) 108 IPC_MESSAGE_HANDLER(ChromeViewMsg_NetErrorInfo, OnNetErrorInfo)
100 IPC_MESSAGE_HANDLER(ChromeViewMsg_SetAltErrorPageURL, OnSetAltErrorPageURL); 109 IPC_MESSAGE_HANDLER(ChromeViewMsg_SetAltErrorPageURL, OnSetAltErrorPageURL);
101 IPC_MESSAGE_UNHANDLED(handled = false) 110 IPC_MESSAGE_UNHANDLED(handled = false)
102 IPC_END_MESSAGE_MAP() 111 IPC_END_MESSAGE_MAP()
103 112
104 return handled; 113 return handled;
105 } 114 }
106 115
116 void NetErrorHelper::NetworkStateChanged(bool enabled) {
117 core_.NetworkStateChanged(enabled);
118 }
119
107 void NetErrorHelper::GetErrorHTML( 120 void NetErrorHelper::GetErrorHTML(
108 blink::WebFrame* frame, 121 blink::WebFrame* frame,
109 const blink::WebURLError& error, 122 const blink::WebURLError& error,
110 bool is_failed_post, 123 bool is_failed_post,
111 std::string* error_html) { 124 std::string* error_html) {
112 core_.GetErrorHTML(GetFrameType(frame), error, is_failed_post, error_html); 125 core_.GetErrorHTML(GetFrameType(frame), error, is_failed_post, error_html);
113 } 126 }
114 127
128 bool NetErrorHelper::ShouldSuppressErrorPage(const GURL& url) {
129 return core_.ShouldSuppressErrorPage(url);
130 }
131
115 void NetErrorHelper::GenerateLocalizedErrorPage(const blink::WebURLError& error, 132 void NetErrorHelper::GenerateLocalizedErrorPage(const blink::WebURLError& error,
116 bool is_failed_post, 133 bool is_failed_post,
117 std::string* error_html) const { 134 std::string* error_html) const {
118 error_html->clear(); 135 error_html->clear();
119 136
120 int resource_id = IDR_NET_ERROR_HTML; 137 int resource_id = IDR_NET_ERROR_HTML;
121 const base::StringPiece template_html( 138 const base::StringPiece template_html(
122 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id)); 139 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
123 if (template_html.empty()) { 140 if (template_html.empty()) {
124 NOTREACHED() << "unable to load template."; 141 NOTREACHED() << "unable to load template.";
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 base::Unretained(this))); 206 base::Unretained(this)));
190 207
191 alt_error_page_fetcher_->SetTimeout( 208 alt_error_page_fetcher_->SetTimeout(
192 base::TimeDelta::FromSeconds(kAlterErrorPageFetchTimeoutSec)); 209 base::TimeDelta::FromSeconds(kAlterErrorPageFetchTimeoutSec));
193 } 210 }
194 211
195 void NetErrorHelper::CancelFetchErrorPage() { 212 void NetErrorHelper::CancelFetchErrorPage() {
196 alt_error_page_fetcher_.reset(); 213 alt_error_page_fetcher_.reset();
197 } 214 }
198 215
216 void NetErrorHelper::ReloadPage() {
217 render_frame()->GetWebFrame()->reload(false);
218 }
219
199 void NetErrorHelper::OnNetErrorInfo(int status_num) { 220 void NetErrorHelper::OnNetErrorInfo(int status_num) {
200 DCHECK(status_num >= 0 && status_num < chrome_common_net::DNS_PROBE_MAX); 221 DCHECK(status_num >= 0 && status_num < chrome_common_net::DNS_PROBE_MAX);
201 222
202 DVLOG(1) << "Received status " << DnsProbeStatusToString(status_num); 223 DVLOG(1) << "Received status " << DnsProbeStatusToString(status_num);
203 224
204 core_.OnNetErrorInfo(static_cast<DnsProbeStatus>(status_num)); 225 core_.OnNetErrorInfo(static_cast<DnsProbeStatus>(status_num));
205 } 226 }
206 227
207 void NetErrorHelper::OnSetAltErrorPageURL(const GURL& alt_error_page_url) { 228 void NetErrorHelper::OnSetAltErrorPageURL(const GURL& alt_error_page_url) {
208 core_.set_alt_error_page_url(alt_error_page_url); 229 core_.set_alt_error_page_url(alt_error_page_url);
209 } 230 }
210 231
211 void NetErrorHelper::OnAlternateErrorPageRetrieved( 232 void NetErrorHelper::OnAlternateErrorPageRetrieved(
212 const blink::WebURLResponse& response, 233 const blink::WebURLResponse& response,
213 const std::string& data) { 234 const std::string& data) {
214 // The fetcher may only be deleted after |data| is passed to |core_|. Move 235 // The fetcher may only be deleted after |data| is passed to |core_|. Move
215 // it to a temporary to prevent any potential re-entrancy issues. 236 // it to a temporary to prevent any potential re-entrancy issues.
216 scoped_ptr<content::ResourceFetcher> fetcher( 237 scoped_ptr<content::ResourceFetcher> fetcher(
217 alt_error_page_fetcher_.release()); 238 alt_error_page_fetcher_.release());
218 if (!response.isNull() && response.httpStatusCode() == 200) { 239 if (!response.isNull() && response.httpStatusCode() == 200) {
219 core_.OnAlternateErrorPageFetched(data); 240 core_.OnAlternateErrorPageFetched(data);
220 } else { 241 } else {
221 core_.OnAlternateErrorPageFetched(""); 242 core_.OnAlternateErrorPageFetched("");
222 } 243 }
223 } 244 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698