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 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ | 5 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ |
6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ | 6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 | 9 |
10 #include "android_webview/browser/aw_contents_client_bridge_base.h" | 10 #include "android_webview/browser/aw_contents_client_bridge_base.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 ~AwContentsClientBridge() override; | 33 ~AwContentsClientBridge() override; |
34 | 34 |
35 // AwContentsClientBridgeBase implementation | 35 // AwContentsClientBridgeBase implementation |
36 void AllowCertificateError(int cert_error, | 36 void AllowCertificateError(int cert_error, |
37 net::X509Certificate* cert, | 37 net::X509Certificate* cert, |
38 const GURL& request_url, | 38 const GURL& request_url, |
39 const base::Callback<void(bool)>& callback, | 39 const base::Callback<void(bool)>& callback, |
40 bool* cancel_request) override; | 40 bool* cancel_request) override; |
41 void SelectClientCertificate( | 41 void SelectClientCertificate( |
42 net::SSLCertRequestInfo* cert_request_info, | 42 net::SSLCertRequestInfo* cert_request_info, |
43 const SelectCertificateCallback& callback) override; | 43 scoped_ptr<content::ClientCertificateDelegate> delegate) override; |
44 | 44 |
45 void RunJavaScriptDialog( | 45 void RunJavaScriptDialog( |
46 content::JavaScriptMessageType message_type, | 46 content::JavaScriptMessageType message_type, |
47 const GURL& origin_url, | 47 const GURL& origin_url, |
48 const base::string16& message_text, | 48 const base::string16& message_text, |
49 const base::string16& default_prompt_text, | 49 const base::string16& default_prompt_text, |
50 const content::JavaScriptDialogManager::DialogClosedCallback& callback) | 50 const content::JavaScriptDialogManager::DialogClosedCallback& callback) |
51 override; | 51 override; |
52 void RunBeforeUnloadDialog( | 52 void RunBeforeUnloadDialog( |
53 const GURL& origin_url, | 53 const GURL& origin_url, |
(...skipping 12 matching lines...) Expand all Loading... |
66 | 66 |
67 private: | 67 private: |
68 void HandleErrorInClientCertificateResponse(int id); | 68 void HandleErrorInClientCertificateResponse(int id); |
69 | 69 |
70 JavaObjectWeakGlobalRef java_ref_; | 70 JavaObjectWeakGlobalRef java_ref_; |
71 | 71 |
72 typedef const base::Callback<void(bool)> CertErrorCallback; | 72 typedef const base::Callback<void(bool)> CertErrorCallback; |
73 IDMap<CertErrorCallback, IDMapOwnPointer> pending_cert_error_callbacks_; | 73 IDMap<CertErrorCallback, IDMapOwnPointer> pending_cert_error_callbacks_; |
74 IDMap<content::JavaScriptDialogManager::DialogClosedCallback, IDMapOwnPointer> | 74 IDMap<content::JavaScriptDialogManager::DialogClosedCallback, IDMapOwnPointer> |
75 pending_js_dialog_callbacks_; | 75 pending_js_dialog_callbacks_; |
76 IDMap<SelectCertificateCallback, IDMapOwnPointer> | 76 // |pending_client_cert_request_delegates_| owns its pointers, but IDMap |
77 pending_client_cert_request_callbacks_; | 77 // doesn't provide Release, so ownership is managed manually. |
| 78 IDMap<content::ClientCertificateDelegate> |
| 79 pending_client_cert_request_delegates_; |
78 }; | 80 }; |
79 | 81 |
80 bool RegisterAwContentsClientBridge(JNIEnv* env); | 82 bool RegisterAwContentsClientBridge(JNIEnv* env); |
81 | 83 |
82 } // namespace android_webview | 84 } // namespace android_webview |
83 | 85 |
84 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ | 86 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ |
OLD | NEW |