OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/ssl/ssl_blocking_page.h" | 5 #include "chrome/browser/ssl/ssl_blocking_page.h" |
6 | 6 |
7 #include "base/build_time.h" | 7 #include "base/build_time.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
10 #include "base/i18n/time_formatting.h" | 10 #include "base/i18n/time_formatting.h" |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 HistoryService* history_service = HistoryServiceFactory::GetForProfile( | 255 HistoryService* history_service = HistoryServiceFactory::GetForProfile( |
256 profile, Profile::EXPLICIT_ACCESS); | 256 profile, Profile::EXPLICIT_ACCESS); |
257 if (history_service) { | 257 if (history_service) { |
258 history_service->GetVisibleVisitCountToHost( | 258 history_service->GetVisibleVisitCountToHost( |
259 request_url_, | 259 request_url_, |
260 base::Bind(&SSLBlockingPage::OnGotHistoryCount, | 260 base::Bind(&SSLBlockingPage::OnGotHistoryCount, |
261 base::Unretained(this)), | 261 base::Unretained(this)), |
262 &request_tracker_); | 262 &request_tracker_); |
263 } | 263 } |
264 } | 264 } |
265 if (SSLErrorInfo::NetErrorToErrorType(cert_error_) == | 265 |
266 SSLErrorInfo::CERT_DATE_INVALID) { | 266 SSLErrorClassification ssl_error_classification( |
267 SSLErrorClassification::RecordUMAStatistics(overridable_ && | 267 base::Time::NowFromSystemTime(), |
268 !strict_enforcement_); | 268 request_url_, |
269 } | 269 *ssl_info_.cert.get()); |
| 270 ssl_error_classification.RecordUMAStatistics( |
| 271 overridable_ && !strict_enforcement_, cert_error_); |
270 | 272 |
271 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) | 273 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) |
272 CaptivePortalService* captive_portal_service = | 274 CaptivePortalService* captive_portal_service = |
273 CaptivePortalServiceFactory::GetForProfile(profile); | 275 CaptivePortalServiceFactory::GetForProfile(profile); |
274 captive_portal_detection_enabled_ = captive_portal_service ->enabled(); | 276 captive_portal_detection_enabled_ = captive_portal_service ->enabled(); |
275 captive_portal_service ->DetectCaptivePortal(); | 277 captive_portal_service ->DetectCaptivePortal(); |
276 registrar_.Add(this, | 278 registrar_.Add(this, |
277 chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT, | 279 chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT, |
278 content::Source<Profile>(profile)); | 280 content::Source<Profile>(profile)); |
279 #endif | 281 #endif |
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
721 // sure we don't clear the captive portal flag, since the interstitial was | 723 // sure we don't clear the captive portal flag, since the interstitial was |
722 // potentially caused by the captive portal. | 724 // potentially caused by the captive portal. |
723 captive_portal_detected_ = captive_portal_detected_ || | 725 captive_portal_detected_ = captive_portal_detected_ || |
724 (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL); | 726 (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL); |
725 // Also keep track of non-HTTP portals and error cases. | 727 // Also keep track of non-HTTP portals and error cases. |
726 captive_portal_no_response_ = captive_portal_no_response_ || | 728 captive_portal_no_response_ = captive_portal_no_response_ || |
727 (results->result == captive_portal::RESULT_NO_RESPONSE); | 729 (results->result == captive_portal::RESULT_NO_RESPONSE); |
728 } | 730 } |
729 #endif | 731 #endif |
730 } | 732 } |
OLD | NEW |