| 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 "android_webview/native/aw_contents_client_bridge.h" | 5 #include "android_webview/native/aw_contents_client_bridge.h" |
| 6 | 6 |
| 7 #include "android_webview/common/devtools_instrumentation.h" | 7 #include "android_webview/common/devtools_instrumentation.h" |
| 8 #include "android_webview/native/aw_contents.h" | 8 #include "android_webview/native/aw_contents.h" |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 if (obj.is_null()) | 141 if (obj.is_null()) |
| 142 return; | 142 return; |
| 143 | 143 |
| 144 // Build the |key_types| JNI parameter, as a String[] | 144 // Build the |key_types| JNI parameter, as a String[] |
| 145 std::vector<std::string> key_types; | 145 std::vector<std::string> key_types; |
| 146 for (size_t i = 0; i < cert_request_info->cert_key_types.size(); ++i) { | 146 for (size_t i = 0; i < cert_request_info->cert_key_types.size(); ++i) { |
| 147 switch (cert_request_info->cert_key_types[i]) { | 147 switch (cert_request_info->cert_key_types[i]) { |
| 148 case net::CLIENT_CERT_RSA_SIGN: | 148 case net::CLIENT_CERT_RSA_SIGN: |
| 149 key_types.push_back("RSA"); | 149 key_types.push_back("RSA"); |
| 150 break; | 150 break; |
| 151 case net::CLIENT_CERT_DSS_SIGN: | |
| 152 key_types.push_back("DSA"); | |
| 153 break; | |
| 154 case net::CLIENT_CERT_ECDSA_SIGN: | 151 case net::CLIENT_CERT_ECDSA_SIGN: |
| 155 key_types.push_back("ECDSA"); | 152 key_types.push_back("ECDSA"); |
| 156 break; | 153 break; |
| 157 default: | 154 default: |
| 158 // Ignore unknown types. | 155 // Ignore unknown types. |
| 159 break; | 156 break; |
| 160 } | 157 } |
| 161 } | 158 } |
| 162 | 159 |
| 163 ScopedJavaLocalRef<jobjectArray> key_types_ref = | 160 ScopedJavaLocalRef<jobjectArray> key_types_ref = |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 pending_client_cert_request_delegates_.Remove(request_id); | 393 pending_client_cert_request_delegates_.Remove(request_id); |
| 397 | 394 |
| 398 delete delegate; | 395 delete delegate; |
| 399 } | 396 } |
| 400 | 397 |
| 401 bool RegisterAwContentsClientBridge(JNIEnv* env) { | 398 bool RegisterAwContentsClientBridge(JNIEnv* env) { |
| 402 return RegisterNativesImpl(env); | 399 return RegisterNativesImpl(env); |
| 403 } | 400 } |
| 404 | 401 |
| 405 } // namespace android_webview | 402 } // namespace android_webview |
| OLD | NEW |