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

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

Issue 2496653002: Part 2 of base::IDMap refactor to eliminate IDMapOwnPointer/IDMapExternalPointer modes (Closed)
Patch Set: typedefs => using statements, update comments in base/id_map.h Created 4 years 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 const base::android::JavaRef<jstring>& prompt); 88 const base::android::JavaRef<jstring>& prompt);
89 void CancelJsResult(JNIEnv*, const base::android::JavaRef<jobject>&, int id); 89 void CancelJsResult(JNIEnv*, const base::android::JavaRef<jobject>&, int id);
90 90
91 private: 91 private:
92 void HandleErrorInClientCertificateResponse(int id); 92 void HandleErrorInClientCertificateResponse(int id);
93 93
94 JavaObjectWeakGlobalRef java_ref_; 94 JavaObjectWeakGlobalRef java_ref_;
95 95
96 typedef const base::Callback<void(content::CertificateRequestResultType)> 96 typedef const base::Callback<void(content::CertificateRequestResultType)>
97 CertErrorCallback; 97 CertErrorCallback;
98 IDMap<CertErrorCallback, IDMapOwnPointer> pending_cert_error_callbacks_; 98 IDMap<std::unique_ptr<CertErrorCallback>> pending_cert_error_callbacks_;
99 IDMap<content::JavaScriptDialogManager::DialogClosedCallback, IDMapOwnPointer> 99 IDMap<std::unique_ptr<content::JavaScriptDialogManager::DialogClosedCallback>>
100 pending_js_dialog_callbacks_; 100 pending_js_dialog_callbacks_;
101 // |pending_client_cert_request_delegates_| owns its pointers, but IDMap 101 // |pending_client_cert_request_delegates_| owns its pointers, but IDMap
102 // doesn't provide Release, so ownership is managed manually. 102 // doesn't provide Release, so ownership is managed manually.
103 IDMap<content::ClientCertificateDelegate> 103 IDMap<content::ClientCertificateDelegate*>
104 pending_client_cert_request_delegates_; 104 pending_client_cert_request_delegates_;
105 }; 105 };
106 106
107 bool RegisterAwContentsClientBridge(JNIEnv* env); 107 bool RegisterAwContentsClientBridge(JNIEnv* env);
108 108
109 } // namespace android_webview 109 } // namespace android_webview
110 110
111 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ 111 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_
OLDNEW
« no previous file with comments | « android_webview/browser/aw_permission_manager.h ('k') | android_webview/native/aw_contents_client_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698