diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-27 17:56:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:36 +0000 |
| commit | 5d0fbf8a6890c395c0cdc0c60e775b70c95e15ed (patch) | |
| tree | c6354b09515a9110c121e3a3f3e97dd94b9b788a /src/core/net/ssl_host_state_delegate_qt.h | |
| parent | 43b7af20c421e4ffb20cd4625f3b704e78e7325d (diff) | |
General adaptations for Chromium 69
Change-Id: Ifeaf0ee13213dc5a24d2f2b4655cf7f405cddef7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/net/ssl_host_state_delegate_qt.h')
| -rw-r--r-- | src/core/net/ssl_host_state_delegate_qt.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/net/ssl_host_state_delegate_qt.h b/src/core/net/ssl_host_state_delegate_qt.h index aeccb42fd..b1b49bcf3 100644 --- a/src/core/net/ssl_host_state_delegate_qt.h +++ b/src/core/net/ssl_host_state_delegate_qt.h @@ -49,12 +49,12 @@ class CertPolicy { public: CertPolicy(); ~CertPolicy(); - bool Check(const net::X509Certificate& cert, net::CertStatus error) const; - void Allow(const net::X509Certificate& cert, net::CertStatus error); + bool Check(const net::X509Certificate& cert, int error) const; + void Allow(const net::X509Certificate& cert, int error); bool HasAllowException() const { return m_allowed.size() > 0; } private: - std::map<net::SHA256HashValue, net::CertStatus> m_allowed; + std::map<net::SHA256HashValue, int> m_allowed; }; class SSLHostStateDelegateQt : public content::SSLHostStateDelegate { @@ -64,10 +64,10 @@ public: ~SSLHostStateDelegateQt(); // content::SSLHostStateDelegate implementation: - void AllowCert(const std::string &, const net::X509Certificate &cert, net::CertStatus error) override; + void AllowCert(const std::string &, const net::X509Certificate &cert, int error) override; void Clear(const base::Callback<bool(const std::string&)>& host_filter) override; - virtual CertJudgment QueryPolicy(const std::string &host, const net::X509Certificate &cert, - net::CertStatus error,bool *expired_previous_decision) override; + CertJudgment QueryPolicy(const std::string &host, const net::X509Certificate &cert, + int error, bool *expired_previous_decision) override; void HostRanInsecureContent(const std::string& host, int child_id, InsecureContentType content_type) override; bool DidHostRunInsecureContent(const std::string& host, int child_id, InsecureContentType content_type) const override; void RevokeUserAllowExceptions(const std::string &host) override; |