Chromium Code Reviews| Index: chrome/browser/ui/website_settings/website_settings.cc |
| diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc |
| index 339053578b17aa49df43bcf27c1a0ebf72ee10f9..ec8c901494552f4c05613798b2cc0a9853938ab7 100644 |
| --- a/chrome/browser/ui/website_settings/website_settings.cc |
| +++ b/chrome/browser/ui/website_settings/website_settings.cc |
| @@ -32,6 +32,7 @@ |
| #include "chrome/common/content_settings_pattern.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/browser/cert_store.h" |
| +#include "content/public/browser/ssl_host_state.h" |
| #include "content/public/browser/user_metrics.h" |
| #include "content/public/common/content_switches.h" |
| #include "content/public/common/ssl_status.h" |
| @@ -533,6 +534,11 @@ void WebsiteSettings::Init(Profile* profile, |
| } |
| } |
| + // Check if a user decision has been made to allow or deny certificates with |
| + // errors on this site. |
| + content::SSLHostState host_state(profile); |
|
Peter Kasting
2014/08/06 01:19:07
Nit: Optional: Could just inline "content::SSLHost
jww
2014/08/06 17:58:18
Done.
|
| + certificate_decision_made_ = host_state.HasAllowedOrDeniedCert(url.host()); |
| + |
| // By default select the permissions tab that displays all the site |
| // permissions. In case of a connection error or an issue with the |
| // certificate presented by the website, select the connection tab to draw |
| @@ -666,6 +672,7 @@ void WebsiteSettings::PresentSiteIdentity() { |
| info.signed_certificate_timestamp_ids.assign( |
| signed_certificate_timestamp_ids_.begin(), |
| signed_certificate_timestamp_ids_.end()); |
| + info.certificate_decision_made = certificate_decision_made_; |
| ui_->SetIdentityInfo(info); |
| } |