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..aeba4d2366e64a3905253019a87ad4f855ffc4f2 100644 |
| --- a/chrome/browser/ui/website_settings/website_settings.cc |
| +++ b/chrome/browser/ui/website_settings/website_settings.cc |
| @@ -30,6 +30,7 @@ |
| #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h" |
| #include "chrome/browser/ui/website_settings/website_settings_ui.h" |
| #include "chrome/common/content_settings_pattern.h" |
| +#include "content/browser/ssl/ssl_host_state.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/browser/cert_store.h" |
| #include "content/public/browser/user_metrics.h" |
| @@ -533,6 +534,11 @@ void WebsiteSettings::Init(Profile* profile, |
| } |
| } |
| + // Check if a user decision has been made to allow or deny some certificates |
|
Peter Kasting
2014/07/26 02:40:39
Nit: What does the "some" inserted in this sentenc
jww
2014/07/27 17:29:26
Yup, the "some" was extraneous. Fixed.
|
| + // with errors on this site. |
| + content::SSLHostState* host_state = content::SSLHostState::GetFor(profile); |
| + 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); |
| } |