| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" | 5 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" |
| 6 | 6 |
| 7 #include "base/android/jni_array.h" | 7 #include "base/android/jni_array.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 scoped_ptr<content::ClientCertificateDelegate> delegate) { | 46 scoped_ptr<content::ClientCertificateDelegate> delegate) { |
| 47 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 47 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 48 | 48 |
| 49 // Build the |key_types| JNI parameter, as a String[] | 49 // Build the |key_types| JNI parameter, as a String[] |
| 50 std::vector<std::string> key_types; | 50 std::vector<std::string> key_types; |
| 51 for (size_t n = 0; n < cert_request_info->cert_key_types.size(); ++n) { | 51 for (size_t n = 0; n < cert_request_info->cert_key_types.size(); ++n) { |
| 52 switch (cert_request_info->cert_key_types[n]) { | 52 switch (cert_request_info->cert_key_types[n]) { |
| 53 case net::CLIENT_CERT_RSA_SIGN: | 53 case net::CLIENT_CERT_RSA_SIGN: |
| 54 key_types.push_back("RSA"); | 54 key_types.push_back("RSA"); |
| 55 break; | 55 break; |
| 56 case net::CLIENT_CERT_DSS_SIGN: | |
| 57 key_types.push_back("DSA"); | |
| 58 break; | |
| 59 case net::CLIENT_CERT_ECDSA_SIGN: | 56 case net::CLIENT_CERT_ECDSA_SIGN: |
| 60 key_types.push_back("ECDSA"); | 57 key_types.push_back("ECDSA"); |
| 61 break; | 58 break; |
| 62 default: | 59 default: |
| 63 // Ignore unknown types. | 60 // Ignore unknown types. |
| 64 break; | 61 break; |
| 65 } | 62 } |
| 66 } | 63 } |
| 67 | 64 |
| 68 JNIEnv* env = base::android::AttachCurrentThread(); | 65 JNIEnv* env = base::android::AttachCurrentThread(); |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 net::SSLCertRequestInfo* cert_request_info, | 201 net::SSLCertRequestInfo* cert_request_info, |
| 205 scoped_ptr<content::ClientCertificateDelegate> delegate) { | 202 scoped_ptr<content::ClientCertificateDelegate> delegate) { |
| 206 ui::WindowAndroid* window = | 203 ui::WindowAndroid* window = |
| 207 WindowAndroidHelper::FromWebContents(contents)->GetWindowAndroid(); | 204 WindowAndroidHelper::FromWebContents(contents)->GetWindowAndroid(); |
| 208 DCHECK(window); | 205 DCHECK(window); |
| 209 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 206 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 210 StartClientCertificateRequest(cert_request_info, window, delegate.Pass()); | 207 StartClientCertificateRequest(cert_request_info, window, delegate.Pass()); |
| 211 } | 208 } |
| 212 | 209 |
| 213 } // namespace chrome | 210 } // namespace chrome |
| OLD | NEW |