| 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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 } | 372 } |
| 373 callback->Run(false, base::string16()); | 373 callback->Run(false, base::string16()); |
| 374 pending_js_dialog_callbacks_.Remove(id); | 374 pending_js_dialog_callbacks_.Remove(id); |
| 375 } | 375 } |
| 376 | 376 |
| 377 // Use to cleanup if there is an error in client certificate response. | 377 // Use to cleanup if there is an error in client certificate response. |
| 378 void AwContentsClientBridge::HandleErrorInClientCertificateResponse( | 378 void AwContentsClientBridge::HandleErrorInClientCertificateResponse( |
| 379 int request_id) { | 379 int request_id) { |
| 380 SelectCertificateCallback* callback = | 380 SelectCertificateCallback* callback = |
| 381 pending_client_cert_request_callbacks_.Lookup(request_id); | 381 pending_client_cert_request_callbacks_.Lookup(request_id); |
| 382 callback->Run(scoped_refptr<net::X509Certificate>()); | 382 callback->Run(nullptr); |
| 383 pending_client_cert_request_callbacks_.Remove(request_id); | 383 pending_client_cert_request_callbacks_.Remove(request_id); |
| 384 } | 384 } |
| 385 | 385 |
| 386 bool RegisterAwContentsClientBridge(JNIEnv* env) { | 386 bool RegisterAwContentsClientBridge(JNIEnv* env) { |
| 387 return RegisterNativesImpl(env); | 387 return RegisterNativesImpl(env); |
| 388 } | 388 } |
| 389 | 389 |
| 390 } // namespace android_webview | 390 } // namespace android_webview |
| OLD | NEW |