Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Unified Diff: chrome/browser/ssl/ssl_manager.cc

Issue 20296: Remember that we've white listed a certificate when we switch to a new tab.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ssl/ssl_manager.cc
===================================================================
--- chrome/browser/ssl/ssl_manager.cc (revision 9212)
+++ chrome/browser/ssl/ssl_manager.cc (working copy)
@@ -13,6 +13,7 @@
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/resource_request_details.h"
#include "chrome/browser/ssl/ssl_error_info.h"
+#include "chrome/browser/ssl/ssl_host_state.h"
#include "chrome/browser/ssl/ssl_policy.h"
#include "chrome/browser/tab_contents/infobar_delegate.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
@@ -36,14 +37,14 @@
class SSLInfoBarDelegate : public ConfirmInfoBarDelegate {
public:
- SSLInfoBarDelegate(TabContents* contents,
- const std::wstring message,
- const std::wstring& button_label,
- Task* task)
- : ConfirmInfoBarDelegate(contents),
- message_(message),
- button_label_(button_label),
- task_(task) {
+ SSLInfoBarDelegate(TabContents* contents,
+ const std::wstring message,
+ const std::wstring& button_label,
+ Task* task)
+ : ConfirmInfoBarDelegate(contents),
+ message_(message),
+ button_label_(button_label),
+ task_(task) {
}
virtual ~SSLInfoBarDelegate() {}
@@ -94,7 +95,8 @@
SSLManager::SSLManager(NavigationController* controller, Delegate* delegate)
: controller_(controller),
- delegate_(delegate) {
+ delegate_(delegate),
+ ssl_host_state_(controller->profile()->GetSSLHostState()) {
DCHECK(controller_);
// If do delegate is supplied, use the default policy.
@@ -184,33 +186,27 @@
void SSLManager::DenyCertForHost(net::X509Certificate* cert,
const std::string& host) {
// Remember that we don't like this cert for this host.
- // TODO(abarth): Do we want to persist this information in the user's profile?
- cert_policy_for_host_[host].Deny(cert);
+ ssl_host_state_->DenyCertForHost(cert, host);
}
// Delegate API method.
void SSLManager::AllowCertForHost(net::X509Certificate* cert,
const std::string& host) {
- // Remember that we do like this cert for this host.
- // TODO(abarth): Do we want to persist this information in the user's profile?
- cert_policy_for_host_[host].Allow(cert);
+ ssl_host_state_->AllowCertForHost(cert, host);
}
// Delegate API method.
net::X509Certificate::Policy::Judgment SSLManager::QueryPolicy(
net::X509Certificate* cert, const std::string& host) {
- // TODO(abarth): Do we want to read this information from the user's profile?
- return cert_policy_for_host_[host].Check(cert);
+ return ssl_host_state_->QueryPolicy(cert, host);
}
bool SSLManager::CanShowInsecureContent(const GURL& url) {
- // TODO(jcampan): Do we want to read this information from the user's profile?
- return (can_show_insecure_content_for_host_.find(url.host()) !=
- can_show_insecure_content_for_host_.end());
+ return ssl_host_state_->CanShowInsecureContent(url);
}
void SSLManager::AllowShowInsecureContentForURL(const GURL& url) {
- can_show_insecure_content_for_host_.insert(url.host());
+ ssl_host_state_->AllowShowInsecureContentForURL(url);
}
bool SSLManager::ProcessedSSLErrorFromRequest() const {
@@ -602,7 +598,7 @@
// If the frame has been blocked we keep our security style as
// authenticated in that case as nothing insecure is actually showing or
// loaded.
- if (!details->is_content_filtered &&
+ if (!details->is_content_filtered &&
!details->entry->ssl().has_mixed_content()) {
details->entry->ssl().set_has_mixed_content();
changed = true;

Powered by Google App Engine
This is Rietveld 408576698