Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| 11 #include "base/json/json_writer.h" | 11 #include "base/json/json_writer.h" |
| 12 #include "base/metrics/field_trial.h" | |
| 12 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 14 #include "base/values.h" | 15 #include "base/values.h" |
| 15 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/common/localized_error.h" | 17 #include "chrome/common/localized_error.h" |
| 17 #include "chrome/common/net/net_error_info.h" | 18 #include "chrome/common/net/net_error_info.h" |
| 18 #include "chrome/common/render_messages.h" | 19 #include "chrome/common/render_messages.h" |
| 19 #include "chrome/renderer/net/error_cache_load.h" | 20 #include "chrome/renderer/net/error_cache_load.h" |
| 20 #include "content/public/common/content_client.h" | 21 #include "content/public/common/content_client.h" |
| 21 #include "content/public/common/url_constants.h" | 22 #include "content/public/common/url_constants.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 } | 80 } |
| 80 | 81 |
| 81 } // namespace | 82 } // namespace |
| 82 | 83 |
| 83 NetErrorHelper::NetErrorHelper(RenderFrame* render_view) | 84 NetErrorHelper::NetErrorHelper(RenderFrame* render_view) |
| 84 : RenderFrameObserver(render_view), | 85 : RenderFrameObserver(render_view), |
| 85 content::RenderFrameObserverTracker<NetErrorHelper>(render_view), | 86 content::RenderFrameObserverTracker<NetErrorHelper>(render_view), |
| 86 core_(this) { | 87 core_(this) { |
| 87 RenderThread::Get()->AddObserver(this); | 88 RenderThread::Get()->AddObserver(this); |
| 88 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 89 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| 89 bool auto_reload_enabled = | 90 std::string field_trial_group = |
| 90 command_line->HasSwitch(switches::kEnableOfflineAutoReload); | 91 base::FieldTrialList::FindFullName("AutoReloadExperiment"); |
| 92 bool auto_reload_enabled = false; | |
|
mmenke
2014/03/28 14:54:02
nit: Do we really need this bool?
| |
| 93 | |
| 94 if (field_trial_group == "Enabled" || | |
| 95 command_line->HasSwitch(switches::kEnableOfflineAutoReload)) | |
|
mmenke
2014/03/28 14:54:02
nit: Use braces {} when if statement+body takes u
| |
| 96 auto_reload_enabled = true; | |
| 91 core_.set_auto_reload_enabled(auto_reload_enabled); | 97 core_.set_auto_reload_enabled(auto_reload_enabled); |
| 92 } | 98 } |
| 93 | 99 |
| 94 NetErrorHelper::~NetErrorHelper() { | 100 NetErrorHelper::~NetErrorHelper() { |
| 95 RenderThread::Get()->RemoveObserver(this); | 101 RenderThread::Get()->RemoveObserver(this); |
| 96 } | 102 } |
| 97 | 103 |
| 98 void NetErrorHelper::DidStartProvisionalLoad() { | 104 void NetErrorHelper::DidStartProvisionalLoad() { |
| 99 blink::WebFrame* frame = render_frame()->GetWebFrame(); | 105 blink::WebFrame* frame = render_frame()->GetWebFrame(); |
| 100 core_.OnStartLoad(GetFrameType(frame), GetLoadingPageType(frame)); | 106 core_.OnStartLoad(GetFrameType(frame), GetLoadingPageType(frame)); |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 271 if (!response.isNull() && response.httpStatusCode() == 200) { | 277 if (!response.isNull() && response.httpStatusCode() == 200) { |
| 272 core_.OnNavigationCorrectionsFetched( | 278 core_.OnNavigationCorrectionsFetched( |
| 273 data, render_frame()->GetRenderView()->GetAcceptLanguages(), | 279 data, render_frame()->GetRenderView()->GetAcceptLanguages(), |
| 274 LocaleIsRTL()); | 280 LocaleIsRTL()); |
| 275 } else { | 281 } else { |
| 276 core_.OnNavigationCorrectionsFetched( | 282 core_.OnNavigationCorrectionsFetched( |
| 277 "", render_frame()->GetRenderView()->GetAcceptLanguages(), | 283 "", render_frame()->GetRenderView()->GetAcceptLanguages(), |
| 278 LocaleIsRTL()); | 284 LocaleIsRTL()); |
| 279 } | 285 } |
| 280 } | 286 } |
| OLD | NEW |