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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 } | 219 } |
220 | 220 |
221 bool RegisterSSLClientCertificateRequestAndroid(JNIEnv* env) { | 221 bool RegisterSSLClientCertificateRequestAndroid(JNIEnv* env) { |
222 return RegisterNativesImpl(env); | 222 return RegisterNativesImpl(env); |
223 } | 223 } |
224 | 224 |
225 } // namespace android | 225 } // namespace android |
226 | 226 |
227 void ShowSSLClientCertificateSelector( | 227 void ShowSSLClientCertificateSelector( |
228 content::WebContents* contents, | 228 content::WebContents* contents, |
229 const net::HttpNetworkSession* network_session, | |
230 net::SSLCertRequestInfo* cert_request_info, | 229 net::SSLCertRequestInfo* cert_request_info, |
231 const chrome::SelectCertificateCallback& callback) { | 230 const chrome::SelectCertificateCallback& callback) { |
232 ui::WindowAndroid* window = | 231 ui::WindowAndroid* window = |
233 WindowAndroidHelper::FromWebContents(contents)->GetWindowAndroid(); | 232 WindowAndroidHelper::FromWebContents(contents)->GetWindowAndroid(); |
234 DCHECK(window); | 233 DCHECK(window); |
235 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 234 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
236 StartClientCertificateRequest(cert_request_info, window, callback); | 235 StartClientCertificateRequest(cert_request_info, window, callback); |
237 } | 236 } |
238 | 237 |
239 } // namespace chrome | 238 } // namespace chrome |
OLD | NEW |