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

Unified Diff: chrome/browser/ui/android/javascript_app_modal_dialog_android.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: chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
index 0e13fb260bc0e66cc07165cbc4713d2ad0dbc94a..fe7062cec08057892d024547a352903fe14ba6cb 100644
--- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
+++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
@@ -18,7 +18,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
-#include "content/public/common/javascript_message_type.h"
+#include "content/public/common/javascript_dialog_type.h"
#include "jni/JavascriptAppModalDialog_jni.h"
#include "ui/android/window_android.h"
@@ -62,14 +62,14 @@ void JavascriptAppModalDialogAndroid::ShowAppModalDialog() {
ConvertUTF16ToJavaString(env, dialog_->message_text());
bool foremost = tab->IsUserInteractable();
- switch (dialog_->javascript_message_type()) {
- case content::JAVASCRIPT_MESSAGE_TYPE_ALERT: {
+ switch (dialog_->javascript_dialog_type()) {
+ case content::JAVASCRIPT_DIALOG_TYPE_ALERT: {
UMA_HISTOGRAM_BOOLEAN("JSDialogs.IsForemost.Alert", foremost);
dialog_object = Java_JavascriptAppModalDialog_createAlertDialog(
env, title, message, dialog_->display_suppress_checkbox());
break;
}
- case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM: {
+ case content::JAVASCRIPT_DIALOG_TYPE_CONFIRM: {
if (dialog_->is_before_unload_dialog()) {
dialog_object = Java_JavascriptAppModalDialog_createBeforeUnloadDialog(
env, title, message, dialog_->is_reload(),
@@ -81,7 +81,7 @@ void JavascriptAppModalDialogAndroid::ShowAppModalDialog() {
}
break;
}
- case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT: {
+ case content::JAVASCRIPT_DIALOG_TYPE_PROMPT: {
UMA_HISTOGRAM_BOOLEAN("JSDialogs.IsForemost.Prompt", foremost);
ScopedJavaLocalRef<jstring> default_prompt_text =
ConvertUTF16ToJavaString(env, dialog_->default_prompt_text());
« no previous file with comments | « android_webview/native/aw_contents_client_bridge.cc ('k') | chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698