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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 content::WebContents* web_contents, | 180 content::WebContents* web_contents, |
181 int cert_error, | 181 int cert_error, |
182 const net::SSLInfo& ssl_info, | 182 const net::SSLInfo& ssl_info, |
183 const GURL& request_url, | 183 const GURL& request_url, |
184 int options_mask, | 184 int options_mask, |
185 const base::Time& time_triggered, | 185 const base::Time& time_triggered, |
186 std::unique_ptr<SSLCertReporter> ssl_cert_reporter, | 186 std::unique_ptr<SSLCertReporter> ssl_cert_reporter, |
187 bool overridable, | 187 bool overridable, |
188 std::unique_ptr<ChromeMetricsHelper> metrics_helper, | 188 std::unique_ptr<ChromeMetricsHelper> metrics_helper, |
189 const base::Callback<void(content::CertificateRequestResultType)>& callback) | 189 const base::Callback<void(content::CertificateRequestResultType)>& callback) |
190 : SecurityInterstitialPage(web_contents, | 190 : SecurityInterstitialPage( |
191 request_url, | 191 web_contents, |
192 std::move(metrics_helper)), | 192 request_url, |
| 193 base::MakeUnique<ChromeControllerClient>( |
| 194 web_contents, std::move(metrics_helper))), |
193 callback_(callback), | 195 callback_(callback), |
194 ssl_info_(ssl_info), | 196 ssl_info_(ssl_info), |
195 overridable_(overridable), | 197 overridable_(overridable), |
196 expired_but_previously_allowed_( | 198 expired_but_previously_allowed_( |
197 (options_mask & SSLErrorUI::EXPIRED_BUT_PREVIOUSLY_ALLOWED) != 0), | 199 (options_mask & SSLErrorUI::EXPIRED_BUT_PREVIOUSLY_ALLOWED) != 0), |
198 cert_report_helper_(new CertReportHelper( | 200 cert_report_helper_(new CertReportHelper( |
199 std::move(ssl_cert_reporter), | 201 std::move(ssl_cert_reporter), |
200 web_contents, | 202 web_contents, |
201 request_url, | 203 request_url, |
202 ssl_info, | 204 ssl_info, |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
300 | 302 |
301 // static | 303 // static |
302 bool SSLBlockingPage::IsOverridable(int options_mask, | 304 bool SSLBlockingPage::IsOverridable(int options_mask, |
303 const Profile* const profile) { | 305 const Profile* const profile) { |
304 const bool is_overridable = | 306 const bool is_overridable = |
305 (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) && | 307 (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) && |
306 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT) && | 308 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT) && |
307 profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed); | 309 profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed); |
308 return is_overridable; | 310 return is_overridable; |
309 } | 311 } |
OLD | NEW |