| Index: chrome/browser/ssl/ssl_blocking_page.cc
|
| diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
|
| index eb646ebaf3fda0214e528afcf422adf29f12f3a4..13cc0929a1752ed2f6a6856faac2e1bf6f886c9e 100644
|
| --- a/chrome/browser/ssl/ssl_blocking_page.cc
|
| +++ b/chrome/browser/ssl/ssl_blocking_page.cc
|
| @@ -331,8 +331,7 @@ SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents,
|
| callback_(callback),
|
| cert_error_(cert_error),
|
| ssl_info_(ssl_info),
|
| - overridable_(options_mask & OVERRIDABLE &&
|
| - !(options_mask & STRICT_ENFORCEMENT)),
|
| + overridable_(IsOverridable(options_mask)),
|
| danger_overridable_(true),
|
| strict_enforcement_((options_mask & STRICT_ENFORCEMENT) != 0),
|
| internal_(false),
|
| @@ -721,6 +720,12 @@ void SSLBlockingPage::SetExtraInfo(
|
| }
|
| }
|
|
|
| +// static
|
| +bool SSLBlockingPage::IsOverridable(int options_mask) {
|
| + return (options_mask & SSLBlockingPage::OVERRIDABLE) &&
|
| + !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT);
|
| +}
|
| +
|
| void SSLBlockingPage::OnGotHistoryCount(bool success,
|
| int num_visits,
|
| base::Time first_visit) {
|
|
|