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

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: Fixes Created 6 years, 10 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>
8 8
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/localized_error.h" 13 #include "chrome/common/localized_error.h"
14 #include "chrome/common/net/net_error_info.h" 14 #include "chrome/common/net/net_error_info.h"
15 #include "chrome/common/render_messages.h" 15 #include "chrome/common/render_messages.h"
16 #include "chrome/renderer/net/mockable_one_shot_timer.h"
16 #include "content/public/common/content_client.h" 17 #include "content/public/common/content_client.h"
17 #include "content/public/common/url_constants.h" 18 #include "content/public/common/url_constants.h"
18 #include "content/public/renderer/content_renderer_client.h" 19 #include "content/public/renderer/content_renderer_client.h"
19 #include "content/public/renderer/render_frame.h" 20 #include "content/public/renderer/render_frame.h"
20 #include "content/public/renderer/render_thread.h" 21 #include "content/public/renderer/render_thread.h"
21 #include "content/public/renderer/render_view.h" 22 #include "content/public/renderer/render_view.h"
22 #include "content/public/renderer/resource_fetcher.h" 23 #include "content/public/renderer/resource_fetcher.h"
23 #include "grit/renderer_resources.h" 24 #include "grit/renderer_resources.h"
24 #include "ipc/ipc_message.h" 25 #include "ipc/ipc_message.h"
25 #include "ipc/ipc_message_macros.h" 26 #include "ipc/ipc_message_macros.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 58 }
58 59
59 NetErrorHelperCore::FrameType GetFrameType(const blink::WebFrame* frame) { 60 NetErrorHelperCore::FrameType GetFrameType(const blink::WebFrame* frame) {
60 if (!frame->parent()) 61 if (!frame->parent())
61 return NetErrorHelperCore::MAIN_FRAME; 62 return NetErrorHelperCore::MAIN_FRAME;
62 return NetErrorHelperCore::SUB_FRAME; 63 return NetErrorHelperCore::SUB_FRAME;
63 } 64 }
64 65
65 } // namespace 66 } // namespace
66 67
67 NetErrorHelper::NetErrorHelper(RenderFrame* render_view) 68 NetErrorHelper::NetErrorHelper(RenderFrame* render_view,
69 bool auto_reload_enabled)
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 core_.set_auto_reload_enabled(auto_reload_enabled);
Randy Smith (Not in Mondays) 2014/02/06 16:47:16 Why not as part of the constructor?
71 } 74 }
72 75
73 NetErrorHelper::~NetErrorHelper() { 76 NetErrorHelper::~NetErrorHelper() {
74 } 77 }
75 78
76 void NetErrorHelper::DidStartProvisionalLoad() { 79 void NetErrorHelper::DidStartProvisionalLoad() {
77 blink::WebFrame* frame = render_frame()->GetWebFrame(); 80 blink::WebFrame* frame = render_frame()->GetWebFrame();
78 core_.OnStartLoad(GetFrameType(frame), GetLoadingPageType(frame)); 81 core_.OnStartLoad(GetFrameType(frame), GetLoadingPageType(frame));
79 } 82 }
80 83
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 // The fetcher may only be deleted after |data| is passed to |core_|. Move 215 // The fetcher may only be deleted after |data| is passed to |core_|. Move
213 // it to a temporary to prevent any potential re-entrancy issues. 216 // it to a temporary to prevent any potential re-entrancy issues.
214 scoped_ptr<content::ResourceFetcher> fetcher( 217 scoped_ptr<content::ResourceFetcher> fetcher(
215 alt_error_page_fetcher_.release()); 218 alt_error_page_fetcher_.release());
216 if (!response.isNull() && response.httpStatusCode() == 200) { 219 if (!response.isNull() && response.httpStatusCode() == 200) {
217 core_.OnAlternateErrorPageFetched(data); 220 core_.OnAlternateErrorPageFetched(data);
218 } else { 221 } else {
219 core_.OnAlternateErrorPageFetched(""); 222 core_.OnAlternateErrorPageFetched("");
220 } 223 }
221 } 224 }
225
226 void NetErrorHelper::ReloadPage() {
227 render_frame()->GetWebFrame()->reload(false);
228 }
229
230 MockableOneShotTimer* NetErrorHelper::NewMockableOneShotTimer() {
231 return new MockableOneShotTimer();
232 }
233
234 void NetErrorHelper::NetworkStateChanged(bool enabled) {
235 core_.NetworkStateChanged(enabled);
Randy Smith (Not in Mondays) 2014/02/06 16:47:16 Could you make NetErrorHelperCore a RenderProcessO
236 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698