Index: chrome/browser/ui/views/ssl_client_certificate_selector.h |
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h |
index a65316d304f00743ab96b778ee0781351e2dcca2..c719e302c6e68baf97755dde023a24af2dbc0cdd 100644 |
--- a/chrome/browser/ui/views/ssl_client_certificate_selector.h |
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h |
@@ -6,6 +6,7 @@ |
#define CHROME_BROWSER_UI_VIEWS_SSL_CLIENT_CERTIFICATE_SELECTOR_H_ |
#include "base/macros.h" |
+#include "base/memory/weak_ptr.h" |
#include "chrome/browser/ssl/ssl_client_auth_observer.h" |
#include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
#include "chrome/browser/ui/views/certificate_selector.h" |
@@ -31,7 +32,7 @@ class SSLClientCertificateSelector : public chrome::CertificateSelector, |
SSLClientCertificateSelector( |
content::WebContents* web_contents, |
const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info, |
- net::CertificateList client_certs, |
+ net::ClientCertIdentityList client_certs, |
std::unique_ptr<content::ClientCertificateDelegate> delegate); |
~SSLClientCertificateSelector() override; |
@@ -42,14 +43,18 @@ class SSLClientCertificateSelector : public chrome::CertificateSelector, |
// chrome::CertificateSelector: |
void DeleteDelegate() override; |
- bool Accept() override; |
+ bool AcceptCertificate( |
+ std::unique_ptr<net::ClientCertIdentity> identity) override; |
// content::WebContentsObserver: |
void WebContentsDestroyed() override; |
private: |
- // Callback after unlocking certificate slot. |
- void Unlocked(net::X509Certificate* cert); |
+ // Callback after retrieving private key. |
+ void GotPrivateKey(net::X509Certificate* cert, |
+ scoped_refptr<net::SSLPrivateKey> private_key); |
+ |
+ base::WeakPtrFactory<SSLClientCertificateSelector> weak_ptr_factory_{this}; |
DISALLOW_COPY_AND_ASSIGN(SSLClientCertificateSelector); |
}; |