views: Add an Options enum to MessageBoxView control.

ui/views/controls/message_box_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/message_box_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
-#include "ui/base/message_box_flags.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
 
 const int kDefaultMessageWidth = 320;
 
 namespace views {
 
 ///////////////////////////////////////////////////////////////////////////////
 // MessageBoxView, public:
 
-MessageBoxView::MessageBoxView(int dialog_flags,
+MessageBoxView::MessageBoxView(int options,
                                const string16& message,
                                const string16& default_prompt,
                                int message_width)
     : message_label_(new Label(message)),
       prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
       message_width_(message_width) {
-  Init(dialog_flags, default_prompt);
+  Init(options, default_prompt);
 }
 
-MessageBoxView::MessageBoxView(int dialog_flags,
+MessageBoxView::MessageBoxView(int options,
                                const string16& message,
                                const string16& default_prompt)
     : message_label_(new Label(message)),
       prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
       message_width_(kDefaultMessageWidth) {
-  Init(dialog_flags, default_prompt);
+  Init(options, default_prompt);
 }
 
 MessageBoxView::~MessageBoxView() {}
 
 string16 MessageBoxView::GetInputText() {
   return prompt_field_ ? prompt_field_->text() : string16();
 }
 
 bool MessageBoxView::IsCheckBoxSelected() {
   return checkbox_ ? checkbox_->checked() : false;
@@ skipping 56 matching lines @@
     return false;
 
   ui::ScopedClipboardWriter scw(clipboard);
   scw.WriteText(message_label_->GetText());
   return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // MessageBoxView, private:
 
-void MessageBoxView::Init(int dialog_flags,
+void MessageBoxView::Init(int options,
                           const string16& default_prompt) {
   message_label_->SetMultiLine(true);
   message_label_->SetAllowCharacterBreak(true);
-  if (dialog_flags & ui::MessageBoxFlags::kAutoDetectAlignment) {
+  if (options & DETECT_ALIGNMENT) {
     // Determine the alignment and directionality based on the first character
     // with strong directionality.
     base::i18n::TextDirection direction =
         base::i18n::GetFirstStrongCharacterDirection(
             message_label_->GetText());
     Label::Alignment alignment;
     if (direction == base::i18n::RIGHT_TO_LEFT)
       alignment = Label::ALIGN_RIGHT;
     else
       alignment = Label::ALIGN_LEFT;
     // In addition, we should set the RTL alignment mode as
     // AUTO_DETECT_ALIGNMENT so that the alignment will not be flipped around
     // in RTL locales.
     message_label_->set_rtl_alignment_mode(Label::AUTO_DETECT_ALIGNMENT);
     message_label_->SetHorizontalAlignment(alignment);
   } else {
     message_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   }
 
-  if (dialog_flags & ui::MessageBoxFlags::kFlagHasPromptField) {
+  if (options & HAS_PROMPT_FIELD) {
     prompt_field_ = new Textfield;
     prompt_field_->SetText(default_prompt);
   }
 
   ResetLayoutManager();
 }
 
 void MessageBoxView::ResetLayoutManager() {
   // Initialize the Grid Layout Manager used for this dialog box.
   GridLayout* layout = GridLayout::CreatePanel(this);
@@ skipping 55 matching lines @@
   if (checkbox_) {
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     layout->StartRow(0, checkbox_column_view_set_id);
     layout->AddView(checkbox_);
   }
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }
 
 }  // namespace views