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

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/views/controls/message_box_view.cc b/chrome/views/controls/message_box_view.cc
index 7fc4a26..35bd80a 100644
--- a/chrome/views/controls/message_box_view.cc
+++ b/chrome/views/controls/message_box_view.cc
@@ -93,7 +93,7 @@ void MessageBoxView::ViewHierarchyChanged(bool is_add,
 void MessageBoxView::Init(int dialog_flags,
                           const std::wstring& default_prompt) {
   message_label_->SetMultiLine(true);
-  if (dialog_flags & MessageBox::kAutoDetectAlignment) {
+  if (dialog_flags & MessageBoxFlags::kAutoDetectAlignment) {
     // Determine the alignment and directionality based on the first character
     // with strong directionality.
     l10n_util::TextDirection direction =
@@ -112,7 +112,7 @@ void MessageBoxView::Init(int dialog_flags,
     message_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   }
 
-  if (dialog_flags & MessageBox::kFlagHasPromptField) {
+  if (dialog_flags & MessageBoxFlags::kFlagHasPromptField) {
     prompt_field_ = new views::TextField;
     prompt_field_->SetText(default_prompt);
   }