| Index: content/public/browser/ssl_host_state_delegate.h
|
| diff --git a/content/public/browser/ssl_host_state_delegate.h b/content/public/browser/ssl_host_state_delegate.h
|
| index 859a4e78be5fce2548dc41fa09af757927fbc55d..2476199d313745ebc97e9bdd2ff5dfd16032f15e 100644
|
| --- a/content/public/browser/ssl_host_state_delegate.h
|
| +++ b/content/public/browser/ssl_host_state_delegate.h
|
| @@ -7,13 +7,21 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/threading/non_thread_safe.h"
|
| #include "content/common/content_export.h"
|
| #include "net/cert/x509_certificate.h"
|
|
|
| namespace content {
|
|
|
| +// The SSLHostStateDelegate encapulates the host-specific state for SSL errors.
|
| +// For example, SSLHostStateDelegate remembers whether the user has whitelisted
|
| +// a particular broken cert for use with particular host. We separate this
|
| +// state from the SSLManager because this state is shared across many navigation
|
| +// controllers.
|
| +//
|
| // SSLHostStateDelegate may be implemented by the embedder to provide a storage
|
| -// strategy for certificate decisions.
|
| +// strategy for certificate decisions or it may be left unimplemented to use a
|
| +// default strategy of not remembering decisions at all.
|
| class SSLHostStateDelegate {
|
| public:
|
| // Records that |cert| is not permitted to be used for |host| in the future,
|
| @@ -36,12 +44,23 @@ class SSLHostStateDelegate {
|
| net::X509Certificate* cert,
|
| net::CertStatus error) = 0;
|
|
|
| - // Revoke all allow/deny preferences for |host|.
|
| - virtual void RevokeAllowAndDenyPreferences(const std::string& host) = 0;
|
| + // Revoke all user decisions for |host|. The RevokeUserDecisionsHard version
|
| + // may close idle connections in the process. This version should be used
|
| + // *only* for rare events, such as a user controlled button, as it may be very
|
| + // disruptive to the networking stack.
|
| + virtual void RevokeUserDecisions(const std::string& host) = 0;
|
| + virtual void RevokeUserDecisionsHard(const std::string& host) = 0;
|
|
|
| // Returns true if any decisions has been recorded for |host|, otherwise
|
| // false.
|
| - virtual bool HasAllowedOrDeniedCert(const std::string& host) = 0;
|
| + virtual bool HasUserDecision(const std::string& host) = 0;
|
| +
|
| + // Records that a host has run insecure content.
|
| + virtual void HostRanInsecureContent(const std::string& host, int pid) = 0;
|
| +
|
| + // Returns whether the specified host ran insecure content.
|
| + virtual bool DidHostRunInsecureContent(const std::string& host,
|
| + int pid) const = 0;
|
|
|
| protected:
|
| virtual ~SSLHostStateDelegate() {}
|
|
|