| 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 46ad971efae26dd6142ab724d1af302275e9c338..e62514f49e8e315c836701441595d75255bfae2f 100644
|
| --- a/chrome/browser/ssl/ssl_blocking_page.cc
|
| +++ b/chrome/browser/ssl/ssl_blocking_page.cc
|
| @@ -251,7 +251,8 @@ SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents,
|
| overridable_(IsOverridable(
|
| options_mask,
|
| Profile::FromBrowserContext(web_contents->GetBrowserContext()))),
|
| - danger_overridable_(true),
|
| + danger_overridable_(DoesPolicyAllowDangerOverride(
|
| + Profile::FromBrowserContext(web_contents->GetBrowserContext()))),
|
| strict_enforcement_((options_mask & STRICT_ENFORCEMENT) != 0),
|
| expired_but_previously_allowed_(
|
| (options_mask & EXPIRED_BUT_PREVIOUSLY_ALLOWED) != 0),
|
| @@ -713,3 +714,9 @@ bool SSLBlockingPage::IsOverridable(int options_mask,
|
| profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed);
|
| return is_overridable;
|
| }
|
| +
|
| +// static
|
| +bool SSLBlockingPage::DoesPolicyAllowDangerOverride(
|
| + const Profile* const profile) {
|
| + return profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed);
|
| +}
|
|
|