diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 18:56:23 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 18:56:23 +0000 |
| commit | 93edf7352b4c0500d1561ab0a56034d226ead456 (patch) | |
| tree | 415241006597320384541bf1a8b5874fa71bc1fe /chrome/browser/ssl/ssl_manager.cc | |
| parent | 7312b29f5d2fd9c2b3aa550fee009a8a2cc70826 (diff) | |
| download | chromium_src-93edf7352b4c0500d1561ab0a56034d226ead456.zip chromium_src-93edf7352b4c0500d1561ab0a56034d226ead456.tar.gz chromium_src-93edf7352b4c0500d1561ab0a56034d226ead456.tar.bz2 | |
SSLPolicy Fix: Step 6.
Merge in changes to SSLHostState. We now can store whether a specific origin is "broken," which is the key new bit of state that we need to share between tabs.
Currently, there is a naming inconsistency between the SSLManager names and the SSLHostState names. I'll clear this up when I merge in the new SSLManager.
R=jcampan
BUG=8706
Review URL: http://codereview.chromium.org/42274
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl/ssl_manager.cc')
| -rw-r--r-- | chrome/browser/ssl/ssl_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index f10a344..095e07d 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -208,11 +208,11 @@ net::X509Certificate::Policy::Judgment SSLManager::QueryPolicy( } bool SSLManager::CanShowInsecureContent(const GURL& url) { - return ssl_host_state_->CanShowInsecureContent(url); + return ssl_host_state_->DidAllowMixedContentForHost(url.host()); } void SSLManager::AllowShowInsecureContentForURL(const GURL& url) { - ssl_host_state_->AllowShowInsecureContentForURL(url); + ssl_host_state_->AllowMixedContentForHost(url.host()); } bool SSLManager::ProcessedSSLErrorFromRequest() const { |