Index: chrome/renderer/chrome_content_renderer_client.cc |
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
index 870b7a343ea0929f3c26459f7398182068edf139..1eb7fa9eeeaef090feb1c6c2a3c5ef0eeef08add 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -351,6 +351,10 @@ void ChromeContentRendererClient::RenderThreadStarted() { |
WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( |
extension_resource_scheme); |
+ auto_reload_enabled_ = |
+ command_line->HasSwitch(switches::kEnableOfflineAutoReload); |
+ LOG(ERROR) << "CCRC: auto_reload_enabled_ = " << auto_reload_enabled_; |
+ |
extensions::ExtensionsClient::Set( |
extensions::ChromeExtensionsClient::GetInstance()); |
} |
@@ -386,7 +390,8 @@ void ChromeContentRendererClient::RenderFrameCreated( |
if (render_frame->GetRenderView()->GetMainRenderFrame() == render_frame) { |
// Only attach NetErrorHelper to the main frame, since only the main frame |
// should get error pages. |
- new NetErrorHelper(render_frame); |
+ main_frame_net_error_helper_ = new NetErrorHelper(render_frame, |
+ auto_reload_enabled_); |
} |
} |
@@ -968,6 +973,9 @@ bool ChromeContentRendererClient::HasErrorPage(int http_status_code, |
bool ChromeContentRendererClient::ShouldSuppressErrorPage( |
content::RenderFrame* render_frame, |
const GURL& url) { |
+ if (render_frame->GetRenderView()->GetMainRenderFrame() == render_frame |
+ && main_frame_net_error_helper_->ShouldSuppressErrorPage(url)) |
+ return true; |
mmenke
2014/02/25 22:09:52
This isn't right. There's only one ContentRendere
Randy Smith (Not in Mondays)
2014/02/26 00:07:38
+1.
Elly Fong-Jones
2014/03/03 19:31:07
Done.
Elly Fong-Jones
2014/03/03 19:31:07
Done.
|
// Do not flash an error page if the Instant new tab page fails to load. |
return search_bouncer_.get() && search_bouncer_->IsNewTabPage(url); |
} |