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

Unified Diff: android_webview/native/aw_contents_client_bridge.cc

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 side-by-side diff with in-line comments
Download patch
Index: android_webview/native/aw_contents_client_bridge.cc
diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index 28d089b53497c68d6f890eb9af4ce26e82a5d80d..dff6c0db87934e359519fdc1906db43cb6f84169 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -271,7 +271,7 @@ void AwContentsClientBridge::ProvideClientCertificateResponse(
}
void AwContentsClientBridge::RunJavaScriptDialog(
- content::JavaScriptMessageType message_type,
+ content::JavaScriptDialogType dialog_type,
const GURL& origin_url,
const base::string16& message_text,
const base::string16& default_prompt_text,
@@ -293,20 +293,20 @@ void AwContentsClientBridge::RunJavaScriptDialog(
ScopedJavaLocalRef<jstring> jmessage(
ConvertUTF16ToJavaString(env, message_text));
- switch (message_type) {
- case content::JAVASCRIPT_MESSAGE_TYPE_ALERT: {
+ switch (dialog_type) {
+ case content::JAVASCRIPT_DIALOG_TYPE_ALERT: {
devtools_instrumentation::ScopedEmbedderCallbackTask("onJsAlert");
Java_AwContentsClientBridge_handleJsAlert(env, obj, jurl, jmessage,
callback_id);
break;
}
- case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM: {
+ case content::JAVASCRIPT_DIALOG_TYPE_CONFIRM: {
devtools_instrumentation::ScopedEmbedderCallbackTask("onJsConfirm");
Java_AwContentsClientBridge_handleJsConfirm(env, obj, jurl, jmessage,
callback_id);
break;
}
- case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT: {
+ case content::JAVASCRIPT_DIALOG_TYPE_PROMPT: {
ScopedJavaLocalRef<jstring> jdefault_value(
ConvertUTF16ToJavaString(env, default_prompt_text));
devtools_instrumentation::ScopedEmbedderCallbackTask("onJsPrompt");
« no previous file with comments | « android_webview/native/aw_contents_client_bridge.h ('k') | chrome/browser/ui/android/javascript_app_modal_dialog_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698