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

Unified Diff: chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm

Issue 8553001: views: Add an Options enum to MessageBoxView control. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: adding an IPC_MESSAGE_EXPORT to line 30 of param_traits_macro.h makes it link in shared build Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
index 0defd120e2dc213b7ab99871836546598e396564..ea3acd442f2285328886c119de47e3dd7e55591b 100644
--- a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
@@ -14,7 +14,6 @@
#include "grit/generated_resources.h"
#include "grit/ui_strings.h"
#include "ui/base/l10n/l10n_util_mac.h"
-#include "ui/base/message_box_flags.h"
#include "ui/base/ui_base_types.h"
// Helper object that receives the notification that the dialog/sheet is
@@ -106,11 +105,11 @@ JSModalDialogCocoa::JSModalDialogCocoa(JavaScriptAppModalDialog* dialog)
NSString* other_button = l10n_util::GetNSStringWithFixup(IDS_APP_CANCEL);
bool text_field = false;
bool one_button = false;
- switch (dialog_->dialog_flags()) {
- case ui::MessageBoxFlags::kIsJavascriptAlert:
+ switch (dialog_->javascript_message_type()) {
+ case ui::JAVASCRIPT_MESSAGE_TYPE_ALERT:
one_button = true;
break;
- case ui::MessageBoxFlags::kIsJavascriptConfirm:
+ case ui::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
if (dialog_->is_before_unload_dialog()) {
default_button = l10n_util::GetNSStringWithFixup(
IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL);
@@ -118,7 +117,7 @@ JSModalDialogCocoa::JSModalDialogCocoa(JavaScriptAppModalDialog* dialog)
IDS_BEFOREUNLOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL);
}
break;
- case ui::MessageBoxFlags::kIsJavascriptPrompt:
+ case ui::JAVASCRIPT_MESSAGE_TYPE_PROMPT:
text_field = true;
break;
« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h ('k') | chrome/browser/ui/gtk/js_modal_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698