| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/captive_portal_blocking_page.h" | 5 #include "chrome/browser/ssl/captive_portal_blocking_page.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 8 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| 9 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
| 10 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 11 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 13 #include "base/values.h" | 15 #include "base/values.h" |
| 14 #include "build/build_config.h" | 16 #include "build/build_config.h" |
| 15 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" | 17 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 scoped_ptr<SSLCertReporter> ssl_cert_reporter, | 59 scoped_ptr<SSLCertReporter> ssl_cert_reporter, |
| 58 const net::SSLInfo& ssl_info, | 60 const net::SSLInfo& ssl_info, |
| 59 const base::Callback<void(bool)>& callback) | 61 const base::Callback<void(bool)>& callback) |
| 60 : SecurityInterstitialPage(web_contents, request_url), | 62 : SecurityInterstitialPage(web_contents, request_url), |
| 61 login_url_(login_url), | 63 login_url_(login_url), |
| 62 callback_(callback) { | 64 callback_(callback) { |
| 63 DCHECK(login_url_.is_valid()); | 65 DCHECK(login_url_.is_valid()); |
| 64 | 66 |
| 65 if (ssl_cert_reporter) { | 67 if (ssl_cert_reporter) { |
| 66 cert_report_helper_.reset(new CertReportHelper( | 68 cert_report_helper_.reset(new CertReportHelper( |
| 67 ssl_cert_reporter.Pass(), web_contents, request_url, ssl_info, | 69 std::move(ssl_cert_reporter), web_contents, request_url, ssl_info, |
| 68 certificate_reporting::ErrorReport::INTERSTITIAL_CAPTIVE_PORTAL, false, | 70 certificate_reporting::ErrorReport::INTERSTITIAL_CAPTIVE_PORTAL, false, |
| 69 nullptr)); | 71 nullptr)); |
| 70 } | 72 } |
| 71 | 73 |
| 72 RecordUMA(SHOW_ALL); | 74 RecordUMA(SHOW_ALL); |
| 73 } | 75 } |
| 74 | 76 |
| 75 CaptivePortalBlockingPage::~CaptivePortalBlockingPage() { | 77 CaptivePortalBlockingPage::~CaptivePortalBlockingPage() { |
| 76 } | 78 } |
| 77 | 79 |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 certificate_reporting::ErrorReport::USER_DID_NOT_PROCEED); | 223 certificate_reporting::ErrorReport::USER_DID_NOT_PROCEED); |
| 222 } | 224 } |
| 223 | 225 |
| 224 // Need to explicity deny the certificate via the callback, otherwise memory | 226 // Need to explicity deny the certificate via the callback, otherwise memory |
| 225 // is leaked. | 227 // is leaked. |
| 226 if (!callback_.is_null()) { | 228 if (!callback_.is_null()) { |
| 227 callback_.Run(false); | 229 callback_.Run(false); |
| 228 callback_.Reset(); | 230 callback_.Reset(); |
| 229 } | 231 } |
| 230 } | 232 } |
| OLD | NEW |