Chromium Code Reviews| Index: chrome/browser/ssl/chrome_ssl_host_state_delegate.h |
| diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate.h b/chrome/browser/ssl/chrome_ssl_host_state_delegate.h |
| index 37c32ee729cf58bb2614253467437721ee16e4d7..f48e603ded83a1c036f8140977aef7e54d365e44 100644 |
| --- a/chrome/browser/ssl/chrome_ssl_host_state_delegate.h |
| +++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate.h |
| @@ -35,9 +35,11 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate { |
| net::X509Certificate* cert, |
| net::CertStatus error) OVERRIDE; |
| virtual void Clear() OVERRIDE; |
| - virtual net::CertPolicy::Judgment QueryPolicy(const std::string& host, |
| - net::X509Certificate* cert, |
| - net::CertStatus error) OVERRIDE; |
| + virtual net::CertPolicy::Judgment QueryPolicy( |
| + const std::string& host, |
| + net::X509Certificate* cert, |
| + net::CertStatus error, |
| + bool* expired_previous_decision) OVERRIDE; |
| virtual void RevokeAllowAndDenyPreferences(const std::string& host) OVERRIDE; |
| virtual bool HasAllowedOrDeniedCert(const std::string& host) OVERRIDE; |
| @@ -52,6 +54,8 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate { |
| FRIEND_TEST_ALL_PREFIXES(ForgetInstantlySSLHostStateDelegateTest, |
| MakeAndForgetException); |
| FRIEND_TEST_ALL_PREFIXES(RememberSSLHostStateDelegateTest, AfterRestart); |
| + FRIEND_TEST_ALL_PREFIXES(RememberSSLHostStateDelegateTest, |
| + QueryPolicyExpired); |
| // Used to specify whether new content setting entries should be created if |
| // they don't already exist when querying the user's settings. |
| @@ -91,9 +95,14 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate { |
| // GetValidCertDecisionsDict will create a new set of entries within the |
| // dictionary if they do not already exist. Otherwise will fail and return if |
| // NULL if they do not exist. |
| + // |
| + // |expired_previous_decision| receives a true value if there had been a |
|
sky
2014/08/12 16:47:31
nit: 'receives a true value' -> is set to true
jww
2014/08/12 19:23:42
Done.
|
| + // previous decision made by the user but it has expired. Otherwise it is set |
| + // to false. |
| base::DictionaryValue* GetValidCertDecisionsDict( |
| base::DictionaryValue* dict, |
| - CreateDictionaryEntriesDisposition create_entries); |
| + CreateDictionaryEntriesDisposition create_entries, |
| + bool* expired_previous_decision); |
| scoped_ptr<base::Clock> clock_; |
| RememberSSLExceptionDecisionsDisposition should_remember_ssl_decisions_; |