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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/net/net_error_helper.cc
diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc
index 7a011b1429682b6126722a77542624fcc6c25600..9da39bc278f0b54f0ee3b4672f1958a916aa76f7 100644
--- a/chrome/renderer/net/net_error_helper.cc
+++ b/chrome/renderer/net/net_error_helper.cc
@@ -5,14 +5,16 @@
#include "chrome/renderer/net/net_error_helper.h"
#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.
-
+#include "base/command_line.h"
#include "base/json/json_writer.h"
#include "base/metrics/histogram.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/localized_error.h"
#include "chrome/common/net/net_error_info.h"
#include "chrome/common/render_messages.h"
+#include "chrome/renderer/net/mockable_one_shot_timer.h"
#include "content/public/common/content_client.h"
#include "content/public/common/url_constants.h"
#include "content/public/renderer/content_renderer_client.h"
@@ -67,10 +69,17 @@ NetErrorHelperCore::FrameType GetFrameType(const blink::WebFrame* frame) {
NetErrorHelper::NetErrorHelper(RenderFrame* render_view)
: RenderFrameObserver(render_view),
content::RenderFrameObserverTracker<NetErrorHelper>(render_view),
- core_(this) {
+ core_(this,
+ scoped_ptr<MockableOneShotTimer>(new MockableOneShotTimer())) {
+ RenderThread::Get()->AddObserver(this);
+ CommandLine* command_line = CommandLine::ForCurrentProcess();
+ bool auto_reload_enabled =
+ command_line->HasSwitch(switches::kEnableOfflineAutoReload);
+ core_.set_auto_reload_enabled(auto_reload_enabled);
}
NetErrorHelper::~NetErrorHelper() {
+ RenderThread::Get()->RemoveObserver(this);
}
void NetErrorHelper::DidStartProvisionalLoad() {
@@ -104,6 +113,10 @@ bool NetErrorHelper::OnMessageReceived(const IPC::Message& message) {
return handled;
}
+void NetErrorHelper::NetworkStateChanged(bool enabled) {
+ core_.NetworkStateChanged(enabled);
+}
+
void NetErrorHelper::GetErrorHTML(
blink::WebFrame* frame,
const blink::WebURLError& error,
@@ -112,6 +125,10 @@ void NetErrorHelper::GetErrorHTML(
core_.GetErrorHTML(GetFrameType(frame), error, is_failed_post, error_html);
}
+bool NetErrorHelper::ShouldSuppressErrorPage(const GURL& url) {
+ return core_.ShouldSuppressErrorPage(url);
+}
+
void NetErrorHelper::GenerateLocalizedErrorPage(const blink::WebURLError& error,
bool is_failed_post,
std::string* error_html) const {
@@ -196,6 +213,10 @@ void NetErrorHelper::CancelFetchErrorPage() {
alt_error_page_fetcher_.reset();
}
+void NetErrorHelper::ReloadPage() {
+ render_frame()->GetWebFrame()->reload(false);
+}
+
void NetErrorHelper::OnNetErrorInfo(int status_num) {
DCHECK(status_num >= 0 && status_num < chrome_common_net::DNS_PROBE_MAX);

Powered by Google App Engine
This is Rietveld 408576698