Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(790)

Side by Side Diff: android_webview/native/aw_contents_client_bridge.h

Issue 623833003: replace OVERRIDE and FINAL with override and final in android_webview/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 19 matching lines...) Expand all
30 class AwContentsClientBridge : public AwContentsClientBridgeBase { 30 class AwContentsClientBridge : public AwContentsClientBridgeBase {
31 public: 31 public:
32 AwContentsClientBridge(JNIEnv* env, jobject obj); 32 AwContentsClientBridge(JNIEnv* env, jobject obj);
33 virtual ~AwContentsClientBridge(); 33 virtual ~AwContentsClientBridge();
34 34
35 // AwContentsClientBridgeBase implementation 35 // AwContentsClientBridgeBase implementation
36 virtual void AllowCertificateError(int cert_error, 36 virtual 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 virtual void SelectClientCertificate( 41 virtual void SelectClientCertificate(
42 net::SSLCertRequestInfo* cert_request_info, 42 net::SSLCertRequestInfo* cert_request_info,
43 const SelectCertificateCallback& callback) OVERRIDE; 43 const SelectCertificateCallback& callback) override;
44 44
45 virtual void RunJavaScriptDialog( 45 virtual 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 virtual void RunBeforeUnloadDialog( 52 virtual void RunBeforeUnloadDialog(
53 const GURL& origin_url, 53 const GURL& origin_url,
54 const base::string16& message_text, 54 const base::string16& message_text,
55 const content::JavaScriptDialogManager::DialogClosedCallback& callback) 55 const content::JavaScriptDialogManager::DialogClosedCallback& callback)
56 OVERRIDE; 56 override;
57 virtual bool ShouldOverrideUrlLoading(const base::string16& url) OVERRIDE; 57 virtual bool ShouldOverrideUrlLoading(const base::string16& url) override;
58 58
59 // Methods called from Java. 59 // Methods called from Java.
60 void ProceedSslError(JNIEnv* env, jobject obj, jboolean proceed, jint id); 60 void ProceedSslError(JNIEnv* env, jobject obj, jboolean proceed, jint id);
61 void ProvideClientCertificateResponse(JNIEnv* env, jobject object, 61 void ProvideClientCertificateResponse(JNIEnv* env, jobject object,
62 jint request_id, jobjectArray encoded_chain_ref, 62 jint request_id, jobjectArray encoded_chain_ref,
63 jobject private_key_ref); 63 jobject private_key_ref);
64 void ConfirmJsResult(JNIEnv*, jobject, int id, jstring prompt); 64 void ConfirmJsResult(JNIEnv*, jobject, int id, jstring prompt);
65 void CancelJsResult(JNIEnv*, jobject, int id); 65 void CancelJsResult(JNIEnv*, jobject, int id);
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 IDMap<SelectCertificateCallback, IDMapOwnPointer>
77 pending_client_cert_request_callbacks_; 77 pending_client_cert_request_callbacks_;
78 }; 78 };
79 79
80 bool RegisterAwContentsClientBridge(JNIEnv* env); 80 bool RegisterAwContentsClientBridge(JNIEnv* env);
81 81
82 } // namespace android_webview 82 } // namespace android_webview
83 83
84 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ 84 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_
OLDNEW
« no previous file with comments | « android_webview/native/aw_contents.h ('k') | android_webview/native/aw_contents_io_thread_client_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698