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 <stddef.h> | 7 #include <stddef.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 | 197 |
198 bool RegisterSSLClientCertificateRequestAndroid(JNIEnv* env) { | 198 bool RegisterSSLClientCertificateRequestAndroid(JNIEnv* env) { |
199 return RegisterNativesImpl(env); | 199 return RegisterNativesImpl(env); |
200 } | 200 } |
201 | 201 |
202 } // namespace android | 202 } // namespace android |
203 | 203 |
204 void ShowSSLClientCertificateSelector( | 204 void ShowSSLClientCertificateSelector( |
205 content::WebContents* contents, | 205 content::WebContents* contents, |
206 net::SSLCertRequestInfo* cert_request_info, | 206 net::SSLCertRequestInfo* cert_request_info, |
| 207 net::CertificateList unused_client_certs, |
207 std::unique_ptr<content::ClientCertificateDelegate> delegate) { | 208 std::unique_ptr<content::ClientCertificateDelegate> delegate) { |
208 ui::WindowAndroid* window = ViewAndroidHelper::FromWebContents(contents) | 209 ui::WindowAndroid* window = ViewAndroidHelper::FromWebContents(contents) |
209 ->GetViewAndroid()->GetWindowAndroid(); | 210 ->GetViewAndroid()->GetWindowAndroid(); |
210 DCHECK(window); | 211 DCHECK(window); |
211 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 212 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
212 StartClientCertificateRequest(cert_request_info, window, std::move(delegate)); | 213 StartClientCertificateRequest(cert_request_info, window, std::move(delegate)); |
213 } | 214 } |
214 | 215 |
215 } // namespace chrome | 216 } // namespace chrome |
OLD | NEW |