| Index: chrome/browser/ui/gtk/js_modal_dialog_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc b/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc
|
| index 2037b2982b852a51707a8fd6de8c72c746a23490..d8f12a9cc497974df37f707187edf49f03a3591c 100644
|
| --- a/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc
|
| @@ -57,12 +57,12 @@ JSModalDialogGtk::JSModalDialogGtk(JavaScriptAppModalDialog* dialog,
|
| // We add in the OK button manually later because we want to focus it
|
| // explicitly.
|
| switch (dialog_->dialog_flags()) {
|
| - case ui::MessageBoxFlags::kIsJavascriptAlert:
|
| + case ui::MESSAGE_BOX_IS_JAVASCRIPT_ALERT_DIALOG:
|
| buttons = GTK_BUTTONS_NONE;
|
| message_type = GTK_MESSAGE_WARNING;
|
| break;
|
|
|
| - case ui::MessageBoxFlags::kIsJavascriptConfirm:
|
| + case ui::MESSAGE_BOX_IS_JAVASCRIPT_CONFIRM_DIALOG:
|
| if (dialog_->is_before_unload_dialog()) {
|
| // onbeforeunload also uses a confirm prompt, it just has custom
|
| // buttons. We add the buttons using gtk_dialog_add_button below.
|
| @@ -73,7 +73,7 @@ JSModalDialogGtk::JSModalDialogGtk(JavaScriptAppModalDialog* dialog,
|
| message_type = GTK_MESSAGE_QUESTION;
|
| break;
|
|
|
| - case ui::MessageBoxFlags::kIsJavascriptPrompt:
|
| + case ui::MESSAGE_BOX_IS_JAVASCRIPT_PROMPT_DIALOG:
|
| buttons = GTK_BUTTONS_CANCEL;
|
| message_type = GTK_MESSAGE_QUESTION;
|
| break;
|
| @@ -97,7 +97,7 @@ JSModalDialogGtk::JSModalDialogGtk(JavaScriptAppModalDialog* dialog,
|
|
|
| // Adjust content area as needed. Set up the prompt text entry or
|
| // suppression check box.
|
| - if (ui::MessageBoxFlags::kIsJavascriptPrompt == dialog_->dialog_flags()) {
|
| + if (ui::MESSAGE_BOX_IS_JAVASCRIPT_PROMPT_DIALOG == dialog_->dialog_flags()) {
|
| GtkWidget* content_area =
|
| gtk_dialog_get_content_area(GTK_DIALOG(gtk_dialog_));
|
| GtkWidget* text_box = gtk_entry_new();
|
| @@ -133,7 +133,7 @@ JSModalDialogGtk::JSModalDialogGtk(JavaScriptAppModalDialog* dialog,
|
| // Add the OK button and focus it.
|
| GtkWidget* ok_button = gtk_dialog_add_button(GTK_DIALOG(gtk_dialog_),
|
| GTK_STOCK_OK, GTK_RESPONSE_OK);
|
| - if (ui::MessageBoxFlags::kIsJavascriptPrompt != dialog_->dialog_flags())
|
| + if (ui::MESSAGE_BOX_IS_JAVASCRIPT_PROMPT_DIALOG != dialog_->dialog_flags())
|
| gtk_widget_grab_focus(ok_button);
|
| }
|
|
|
| @@ -149,13 +149,13 @@ JSModalDialogGtk::~JSModalDialogGtk() {
|
|
|
| int JSModalDialogGtk::GetAppModalDialogButtons() const {
|
| switch (dialog_->dialog_flags()) {
|
| - case ui::MessageBoxFlags::kIsJavascriptAlert:
|
| + case ui::MESSAGE_BOX_IS_JAVASCRIPT_ALERT_DIALOG:
|
| return ui::DIALOG_BUTTON_OK;
|
|
|
| - case ui::MessageBoxFlags::kIsJavascriptConfirm:
|
| + case ui::MESSAGE_BOX_IS_JAVASCRIPT_CONFIRM_DIALOG:
|
| return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
|
|
|
| - case ui::MessageBoxFlags::kIsJavascriptPrompt:
|
| + case ui::MESSAGE_BOX_IS_JAVASCRIPT_PROMPT_DIALOG:
|
| return ui::DIALOG_BUTTON_OK;
|
|
|
| default:
|
|
|