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