Add button to page info to revoke user certificate decisions.

chrome/browser/ui/website_settings/website_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/website_settings/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #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/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
+#include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/ssl_status.h"
 #include "content/public/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_cipher_suite_names.h"
@@ skipping 480 matching lines @@
       site_connection_details_ += l10n_util::GetStringUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_FALLBACK_MESSAGE);
     }
     if (no_renegotiation) {
       site_connection_details_ += ASCIIToUTF16("\n\n");
       site_connection_details_ += l10n_util::GetStringUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_RENEGOTIATION_MESSAGE);
     }
   }
 
+  // Check if a user decision has been made to allow or deny certificates with
+  // errors on this site.
+  content::SSLHostStateDelegate* delegate = profile->GetSSLHostStateDelegate();
+  if (delegate)

[Peter Kasting, 2014/08/11 22:35:41]

Is there ever not a delegate?  If so, consider noting in a comment when that can
be the case.

+    have_bypassed_ssl_error_ = delegate->HasUserDecision(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
   // the user's attention to the issue. If the site does not provide a
   // certificate because it was loaded over an unencrypted connection, don't
   // select the connection tab.
   WebsiteSettingsUI::TabId tab_id = WebsiteSettingsUI::TAB_ID_PERMISSIONS;
   if (site_connection_status_ == SITE_CONNECTION_STATUS_ENCRYPTED_ERROR ||
       site_connection_status_ == SITE_CONNECTION_STATUS_MIXED_CONTENT ||
       site_identity_status_ == SITE_IDENTITY_STATUS_ERROR ||
@@ skipping 113 matching lines @@
   info.connection_status = site_connection_status_;
   info.connection_status_description =
       UTF16ToUTF8(site_connection_details_);
   info.identity_status = site_identity_status_;
   info.identity_status_description =
       UTF16ToUTF8(site_identity_details_);
   info.cert_id = cert_id_;
   info.signed_certificate_timestamp_ids.assign(
       signed_certificate_timestamp_ids_.begin(),
       signed_certificate_timestamp_ids_.end());
+  info.have_bypassed_ssl_error = have_bypassed_ssl_error_;
   ui_->SetIdentityInfo(info);
 }
 
 void WebsiteSettings::PresentHistoryInfo(base::Time first_visit) {
   if (first_visit == base::Time()) {
     ui_->SetFirstVisit(base::string16());
     return;
   }
 
   bool visited_before_today = false;
   base::Time today = base::Time::Now().LocalMidnight();
   base::Time first_visit_midnight = first_visit.LocalMidnight();
   visited_before_today = (first_visit_midnight < today);
 
   base::string16 first_visit_text;
   if (visited_before_today) {
     first_visit_text = l10n_util::GetStringFUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
         base::TimeFormatShortDate(first_visit));
   } else {
     first_visit_text = l10n_util::GetStringUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
   }
   ui_->SetFirstVisit(first_visit_text);
 }