diff options
| author | Selim Gurun <sgurun@google.com> | 2011-12-08 10:19:59 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-08 10:19:59 -0800 |
| commit | aa81668752d33ae7a345626ab61f1ea9fc931392 (patch) | |
| tree | 6f7503a17fb74a8e57cadfd6a6d06a4931558b67 /Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h | |
| parent | e50c6da15806ff91b5e9298cb303f2b8f9ae6b35 (diff) | |
| parent | 432a3b5a08c1dff5693d7b804b9e9cf19ad92a2e (diff) | |
| download | external_webkit-aa81668752d33ae7a345626ab61f1ea9fc931392.zip external_webkit-aa81668752d33ae7a345626ab61f1ea9fc931392.tar.gz external_webkit-aa81668752d33ae7a345626ab61f1ea9fc931392.tar.bz2 | |
Merge "Prevent native crashes on client cert request" into ics-mr1
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h index 5f03339..4463dfb 100644 --- a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h +++ b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h @@ -74,7 +74,6 @@ public: void cancelAuth(); void proceedSslCertError(); void cancelSslCertError(int cert_error); - void sslClientCert(EVP_PKEY* pkey, net::X509Certificate* chain); typedef void CallbackFunction(void*); @@ -92,6 +91,8 @@ public: void willSendRequest(PassOwnPtr<WebResponse>); void authRequired(scoped_refptr<net::AuthChallengeInfo>, bool firstTime, bool suppressDialog); void reportSslCertError(int cert_error, net::X509Certificate* cert); + + void sslClientCert(EVP_PKEY* pkey, net::X509Certificate* chain); void requestClientCert(net::SSLCertRequestInfo* cert); // Handle to the chrome IO thread |