diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 23:49:18 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 23:49:18 +0000 |
| commit | 478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d (patch) | |
| tree | f995985b8749bd31da7cbb73ec73cfce24e97987 /chrome/browser/views/jsmessage_box_dialog.cc | |
| parent | 69e38eca8034fe35c22744f59bee77f987ae8755 (diff) | |
| download | chromium_src-478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d.zip chromium_src-478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d.tar.gz chromium_src-478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d.tar.bz2 | |
Reland r14146 which refactors DialogButton into cross platform
code. This is the same as the last change except I renamed
class MessageBox to class MessageBoxFlags to avoid conflicting
with the same name in windows.h.
Review URL: http://codereview.chromium.org/87065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/jsmessage_box_dialog.cc')
| -rw-r--r-- | chrome/browser/views/jsmessage_box_dialog.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/views/jsmessage_box_dialog.cc b/chrome/browser/views/jsmessage_box_dialog.cc index bd0c7f2..b42c2d4 100644 --- a/chrome/browser/views/jsmessage_box_dialog.cc +++ b/chrome/browser/views/jsmessage_box_dialog.cc @@ -20,7 +20,7 @@ JavascriptMessageBoxDialog::JavascriptMessageBoxDialog( : parent_(parent), dialog_(NULL), message_box_view_(new MessageBoxView( - parent->dialog_flags() | MessageBox::kAutoDetectAlignment, + parent->dialog_flags() | MessageBoxFlags::kAutoDetectAlignment, message_text, default_prompt_text)) { DCHECK(message_box_view_); @@ -59,11 +59,11 @@ void JavascriptMessageBoxDialog::CloseModalDialog() { int JavascriptMessageBoxDialog::GetDialogButtons() const { int dialog_buttons = 0; - if (parent_->dialog_flags() & MessageBox::kFlagHasOKButton) - dialog_buttons = DIALOGBUTTON_OK; + if (parent_->dialog_flags() & MessageBoxFlags::kFlagHasOKButton) + dialog_buttons = MessageBoxFlags::DIALOGBUTTON_OK; - if (parent_->dialog_flags() & MessageBox::kFlagHasCancelButton) - dialog_buttons |= DIALOGBUTTON_CANCEL; + if (parent_->dialog_flags() & MessageBoxFlags::kFlagHasCancelButton) + dialog_buttons |= MessageBoxFlags::DIALOGBUTTON_CANCEL; return dialog_buttons; } @@ -96,11 +96,11 @@ bool JavascriptMessageBoxDialog::Accept() { } std::wstring JavascriptMessageBoxDialog::GetDialogButtonLabel( - DialogButton button) const { + MessageBoxFlags::DialogButton button) const { if (parent_->is_before_unload_dialog()) { - if (button == DialogDelegate::DIALOGBUTTON_OK) { + if (button == MessageBoxFlags::DIALOGBUTTON_OK) { return l10n_util::GetString(IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL); - } else if (button == DialogDelegate::DIALOGBUTTON_CANCEL) { + } else if (button == MessageBoxFlags::DIALOGBUTTON_CANCEL) { return l10n_util::GetString( IDS_BEFOREUNLOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL); } |