diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-04 18:24:03 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-04 18:24:03 +0000 |
commit | 848dd0446ed3ebc6f8ae2db868c117788bda7c2f (patch) | |
tree | 5bec47e5ab37e4bd67fd5443ed9cc4f663fe3668 /content/browser/ssl/ssl_policy.h | |
parent | cf7dfc0a53eebbf4831800476212e2c6c0ffe5d5 (diff) | |
download | chromium_src-848dd0446ed3ebc6f8ae2db868c117788bda7c2f.zip chromium_src-848dd0446ed3ebc6f8ae2db868c117788bda7c2f.tar.gz chromium_src-848dd0446ed3ebc6f8ae2db868c117788bda7c2f.tar.bz2 |
Get rid of some SSL dependencies by talking to SSLBlockingPolicy through a callback.
BUG=76697
Review URL: http://codereview.chromium.org/7065070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl/ssl_policy.h')
-rw-r--r-- | content/browser/ssl/ssl_policy.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/content/browser/ssl/ssl_policy.h b/content/browser/ssl/ssl_policy.h index b1bf5a0..302207d 100644 --- a/content/browser/ssl/ssl_policy.h +++ b/content/browser/ssl/ssl_policy.h @@ -8,13 +8,13 @@ #include <string> -#include "chrome/browser/ssl/ssl_blocking_page.h" #include "webkit/glue/resource_type.h" class NavigationEntry; class SSLCertErrorHandler; class SSLPolicyBackend; class SSLRequestInfo; +class TabContents; // SSLPolicy // @@ -22,7 +22,7 @@ class SSLRequestInfo; // SSL trust indicators. It relies on the SSLPolicyBackend to actually enact // the decisions it reaches. // -class SSLPolicy : public SSLBlockingPage::Delegate { +class SSLPolicy { public: explicit SSLPolicy(SSLPolicyBackend* backend); @@ -41,19 +41,16 @@ class SSLPolicy : public SSLBlockingPage::Delegate { SSLPolicyBackend* backend() const { return backend_; } - // SSLBlockingPage::Delegate methods. - virtual SSLErrorInfo GetSSLErrorInfo(SSLCertErrorHandler* handler); - virtual void OnDenyCertificate(SSLCertErrorHandler* handler); - virtual void OnAllowCertificate(SSLCertErrorHandler* handler); - private: + // Callback that the user chose to accept or deny the certificate. + void OnAllowCertificate(SSLCertErrorHandler* handler, bool allow); + // Helper method for derived classes handling certificate errors. // If the error can be overridden by the user, show a blocking page that // lets the user continue or cancel the request. // For fatal certificate errors, show a blocking page that only lets the // user cancel the request. - void OnCertErrorInternal(SSLCertErrorHandler* handler, - SSLBlockingPage::ErrorLevel error_level); + void OnCertErrorInternal(SSLCertErrorHandler* handler, bool overridable); // If the security style of |entry| has not been initialized, then initialize // it with the default style for its URL. |