| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index f6553c3e8370a3fa1221f398a8862494add9d927..b37e14fc3d6592fbf65ffd32262ac77208bc1299 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -1656,6 +1656,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
|
| ResourceType resource_type,
|
| bool overridable,
|
| bool strict_enforcement,
|
| + bool expired_previous_decision,
|
| const base::Callback<void(bool)>& callback,
|
| content::CertificateRequestResultType* result) {
|
| if (resource_type != content::RESOURCE_TYPE_MAIN_FRAME) {
|
| @@ -1693,9 +1694,15 @@ void ChromeContentBrowserClient::AllowCertificateError(
|
|
|
| // Otherwise, display an SSL blocking page. The interstitial page takes
|
| // ownership of ssl_blocking_page.
|
| + int options_mask = 0;
|
| + if (overridable)
|
| + options_mask = SSLBlockingPage::OVERRIDABLE;
|
| + if (strict_enforcement)
|
| + options_mask = SSLBlockingPage::STRICT_ENFORCEMENT;
|
| + if (expired_previous_decision)
|
| + options_mask = SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED;
|
| SSLBlockingPage* ssl_blocking_page = new SSLBlockingPage(
|
| - tab, cert_error, ssl_info, request_url, overridable,
|
| - strict_enforcement, callback);
|
| + tab, cert_error, ssl_info, request_url, options_mask, callback);
|
| ssl_blocking_page->Show();
|
| }
|
|
|
|
|