OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/bad_clock_blocking_page.h" | 5 #include "chrome/browser/ssl/bad_clock_blocking_page.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 // it leaks memory, so don't create it here. | 62 // it leaks memory, so don't create it here. |
63 BadClockBlockingPage::BadClockBlockingPage( | 63 BadClockBlockingPage::BadClockBlockingPage( |
64 content::WebContents* web_contents, | 64 content::WebContents* web_contents, |
65 int cert_error, | 65 int cert_error, |
66 const net::SSLInfo& ssl_info, | 66 const net::SSLInfo& ssl_info, |
67 const GURL& request_url, | 67 const GURL& request_url, |
68 const base::Time& time_triggered, | 68 const base::Time& time_triggered, |
69 ssl_errors::ClockState clock_state, | 69 ssl_errors::ClockState clock_state, |
70 std::unique_ptr<SSLCertReporter> ssl_cert_reporter, | 70 std::unique_ptr<SSLCertReporter> ssl_cert_reporter, |
71 const base::Callback<void(content::CertificateRequestResultType)>& callback) | 71 const base::Callback<void(content::CertificateRequestResultType)>& callback) |
72 : SecurityInterstitialPage(web_contents, | 72 : SecurityInterstitialPage( |
73 request_url, | 73 web_contents, |
74 CreateMetricsHelper(web_contents, request_url)), | 74 request_url, |
| 75 base::MakeUnique<ChromeControllerClient>( |
| 76 web_contents, |
| 77 CreateMetricsHelper(web_contents, request_url))), |
75 callback_(callback), | 78 callback_(callback), |
76 ssl_info_(ssl_info), | 79 ssl_info_(ssl_info), |
77 cert_report_helper_(new CertReportHelper( | 80 cert_report_helper_(new CertReportHelper( |
78 std::move(ssl_cert_reporter), | 81 std::move(ssl_cert_reporter), |
79 web_contents, | 82 web_contents, |
80 request_url, | 83 request_url, |
81 ssl_info, | 84 ssl_info, |
82 certificate_reporting::ErrorReport::INTERSTITIAL_CLOCK, | 85 certificate_reporting::ErrorReport::INTERSTITIAL_CLOCK, |
83 false /* overridable */, | 86 false /* overridable */, |
84 time_triggered, | 87 time_triggered, |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 void BadClockBlockingPage::NotifyDenyCertificate() { | 175 void BadClockBlockingPage::NotifyDenyCertificate() { |
173 // It's possible that callback_ may not exist if the user clicks "Proceed" | 176 // It's possible that callback_ may not exist if the user clicks "Proceed" |
174 // followed by pressing the back button before the interstitial is hidden. | 177 // followed by pressing the back button before the interstitial is hidden. |
175 // In that case the certificate will still be treated as allowed. | 178 // In that case the certificate will still be treated as allowed. |
176 if (callback_.is_null()) | 179 if (callback_.is_null()) |
177 return; | 180 return; |
178 | 181 |
179 base::ResetAndReturn(&callback_) | 182 base::ResetAndReturn(&callback_) |
180 .Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL); | 183 .Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL); |
181 } | 184 } |
OLD | NEW |