| 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 | 9 |
| 9 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| 10 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
| 11 #include "base/android/scoped_java_ref.h" | 12 #include "base/android/scoped_java_ref.h" |
| 12 #include "base/bind.h" | 13 #include "base/bind.h" |
| 13 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 14 #include "base/logging.h" | 15 #include "base/logging.h" |
| 15 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 16 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
| 16 #include "chrome/browser/ui/android/view_android_helper.h" | 17 #include "chrome/browser/ui/android/view_android_helper.h" |
| 17 #include "content/public/browser/browser_thread.h" | 18 #include "content/public/browser/browser_thread.h" |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 } // namespace android | 202 } // namespace android |
| 202 | 203 |
| 203 void ShowSSLClientCertificateSelector( | 204 void ShowSSLClientCertificateSelector( |
| 204 content::WebContents* contents, | 205 content::WebContents* contents, |
| 205 net::SSLCertRequestInfo* cert_request_info, | 206 net::SSLCertRequestInfo* cert_request_info, |
| 206 scoped_ptr<content::ClientCertificateDelegate> delegate) { | 207 scoped_ptr<content::ClientCertificateDelegate> delegate) { |
| 207 ui::WindowAndroid* window = ViewAndroidHelper::FromWebContents(contents) | 208 ui::WindowAndroid* window = ViewAndroidHelper::FromWebContents(contents) |
| 208 ->GetViewAndroid()->GetWindowAndroid(); | 209 ->GetViewAndroid()->GetWindowAndroid(); |
| 209 DCHECK(window); | 210 DCHECK(window); |
| 210 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 211 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 211 StartClientCertificateRequest(cert_request_info, window, delegate.Pass()); | 212 StartClientCertificateRequest(cert_request_info, window, std::move(delegate)); |
| 212 } | 213 } |
| 213 | 214 |
| 214 } // namespace chrome | 215 } // namespace chrome |
| OLD | NEW |