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

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

Issue 2684093002: Rename JavaScript "messages" to "dialogs". (Closed)
Patch Set: win fox Created 3 years, 10 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 28 matching lines...) Expand all
39 net::X509Certificate* cert, 39 net::X509Certificate* cert,
40 const GURL& request_url, 40 const GURL& request_url,
41 const base::Callback<void(content::CertificateRequestResultType)>& 41 const base::Callback<void(content::CertificateRequestResultType)>&
42 callback, 42 callback,
43 bool* cancel_request) override; 43 bool* cancel_request) override;
44 void SelectClientCertificate( 44 void SelectClientCertificate(
45 net::SSLCertRequestInfo* cert_request_info, 45 net::SSLCertRequestInfo* cert_request_info,
46 std::unique_ptr<content::ClientCertificateDelegate> delegate) override; 46 std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
47 47
48 void RunJavaScriptDialog( 48 void RunJavaScriptDialog(
49 content::JavaScriptMessageType message_type, 49 content::JavaScriptDialogType dialog_type,
50 const GURL& origin_url, 50 const GURL& origin_url,
51 const base::string16& message_text, 51 const base::string16& message_text,
52 const base::string16& default_prompt_text, 52 const base::string16& default_prompt_text,
53 const content::JavaScriptDialogManager::DialogClosedCallback& callback) 53 const content::JavaScriptDialogManager::DialogClosedCallback& callback)
54 override; 54 override;
55 void RunBeforeUnloadDialog( 55 void RunBeforeUnloadDialog(
56 const GURL& origin_url, 56 const GURL& origin_url,
57 const content::JavaScriptDialogManager::DialogClosedCallback& callback) 57 const content::JavaScriptDialogManager::DialogClosedCallback& callback)
58 override; 58 override;
59 bool ShouldOverrideUrlLoading(const base::string16& url, 59 bool ShouldOverrideUrlLoading(const base::string16& url,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 // doesn't provide Release, so ownership is managed manually. 109 // doesn't provide Release, so ownership is managed manually.
110 IDMap<content::ClientCertificateDelegate*> 110 IDMap<content::ClientCertificateDelegate*>
111 pending_client_cert_request_delegates_; 111 pending_client_cert_request_delegates_;
112 }; 112 };
113 113
114 bool RegisterAwContentsClientBridge(JNIEnv* env); 114 bool RegisterAwContentsClientBridge(JNIEnv* env);
115 115
116 } // namespace android_webview 116 } // namespace android_webview
117 117
118 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ 118 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_
OLDNEW
« no previous file with comments | « android_webview/browser/aw_javascript_dialog_manager.cc ('k') | android_webview/native/aw_contents_client_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698