| Index: android_webview/native/aw_contents_client_bridge.h
|
| diff --git a/android_webview/native/aw_contents_client_bridge.h b/android_webview/native/aw_contents_client_bridge.h
|
| index 4cd6c6caa130d8c18dbaac68fe876996bad320f1..e718e32873581102448dd21387e70f1de3f7961c 100644
|
| --- a/android_webview/native/aw_contents_client_bridge.h
|
| +++ b/android_webview/native/aw_contents_client_bridge.h
|
| @@ -29,6 +29,7 @@ namespace android_webview {
|
| // any references.
|
| class AwContentsClientBridge : public AwContentsClientBridgeBase {
|
| public:
|
| + typedef base::Callback<void(net::X509Certificate*)> SelectCertificateCallback;
|
|
|
| AwContentsClientBridge(JNIEnv* env, jobject obj);
|
| virtual ~AwContentsClientBridge();
|
| @@ -39,6 +40,9 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase {
|
| const GURL& request_url,
|
| const base::Callback<void(bool)>& callback,
|
| bool* cancel_request) OVERRIDE;
|
| + virtual void SelectClientCertificate(
|
| + net::SSLCertRequestInfo* cert_request_info,
|
| + const SelectCertificateCallback& callback) OVERRIDE;
|
|
|
| virtual void RunJavaScriptDialog(
|
| content::JavaScriptMessageType message_type,
|
| @@ -56,6 +60,9 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase {
|
|
|
| // Methods called from Java.
|
| void ProceedSslError(JNIEnv* env, jobject obj, jboolean proceed, jint id);
|
| + void ProvideClientCertificateResponse(JNIEnv* env, jobject object,
|
| + jlong request_id, jobjectArray encoded_chain_ref,
|
| + jobject private_key_ref);
|
| void ConfirmJsResult(JNIEnv*, jobject, int id, jstring prompt);
|
| void CancelJsResult(JNIEnv*, jobject, int id);
|
|
|
|
|