views: Add a new ctor to MessageBoxView that takes only a InitParams.

ui/views/controls/message_box_view.cc

 // Copyright (c) 2012 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/string_split.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/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"
 
+namespace {
+
 const int kDefaultMessageWidth = 320;
 
-namespace {
-
 // Paragraph separators are defined in
 // http://www.unicode.org/Public/6.0.0/ucd/extracted/DerivedBidiClass.txt
 //
 // # Bidi_Class=Paragraph_Separator
 //
 // 000A          ; B # Cc       <control-000A>
 // 000D          ; B # Cc       <control-000D>
 // 001C..001E    ; B # Cc   [3] <control-001C>..<control-001E>
 // 0085          ; B # Cc       <control-0085>
 // 2029          ; B # Zp       PARAGRAPH SEPARATOR
@@ skipping 51 matching lines @@
   r->push_back(last);
 }
 
 }  // namespace
 
 namespace views {
 
 ///////////////////////////////////////////////////////////////////////////////
 // MessageBoxView, public:
 
-MessageBoxView::MessageBoxView(int options,
-                               const string16& message,
-                               const string16& default_prompt,
-                               int message_width)
+MessageBoxView::InitParams::InitParams(const string16& message)
+    : options(NO_OPTIONS),
+      message(message),
+      message_width(kDefaultMessageWidth) {
+}
+
+MessageBoxView::InitParams::~InitParams() {
+}
+
+MessageBoxView::MessageBoxView(const InitParams& params)
     : prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
-      message_width_(message_width) {
-  Init(options, message, default_prompt);
-}
-
-MessageBoxView::MessageBoxView(int options,
-                               const string16& message,
-                               const string16& default_prompt)
-    : prompt_field_(NULL),
-      icon_(NULL),
-      checkbox_(NULL),
-      message_width_(kDefaultMessageWidth) {
-  Init(options, message, default_prompt);
+      message_width_(params.message_width) {
+  Init(params);
 }
 
 MessageBoxView::~MessageBoxView() {}
 
 string16 MessageBoxView::GetInputText() {
   return prompt_field_ ? prompt_field_->text() : string16();
 }
 
 bool MessageBoxView::IsCheckBoxSelected() {
   return checkbox_ ? checkbox_->checked() : false;
@@ skipping 59 matching lines @@
   string16 text = message_labels_[0]->text();
   for (size_t i = 1; i < message_labels_.size(); ++i)
     text += message_labels_[i]->text();
   scw.WriteText(text);
   return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // MessageBoxView, private:
 
-void MessageBoxView::Init(int options,
-                          const string16& message,
-                          const string16& prompt) {
-  if (options & DETECT_DIRECTIONALITY) {
+void MessageBoxView::Init(const InitParams& params) {
+  if (params.options & DETECT_DIRECTIONALITY) {
     std::vector<string16> texts;
-    SplitStringIntoParagraphs(message, &texts);
+    SplitStringIntoParagraphs(params.message, &texts);
     // If the text originates from a web page, its alignment is based on its
     // first character with strong directionality.
     base::i18n::TextDirection message_direction =
-        base::i18n::GetFirstStrongCharacterDirection(message);
+        base::i18n::GetFirstStrongCharacterDirection(params.message);
     Label::Alignment alignment =
         (message_direction == base::i18n::RIGHT_TO_LEFT) ?
         Label::ALIGN_RIGHT : Label::ALIGN_LEFT;
     for (size_t i = 0; i < texts.size(); ++i) {
       Label* message_label = new Label(texts[i]);
       message_label->SetMultiLine(true);
       message_label->SetAllowCharacterBreak(true);
       message_label->set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
       message_label->SetHorizontalAlignment(alignment);
       message_labels_.push_back(message_label);
     }
   } else {
-    Label* message_label = new Label(message);
+    Label* message_label = new Label(params.message);
     message_label->SetMultiLine(true);
     message_label->SetAllowCharacterBreak(true);
     message_label->SetHorizontalAlignment(Label::ALIGN_LEFT);
     message_labels_.push_back(message_label);
   }
 
-  if (options & HAS_PROMPT_FIELD) {
+  if (params.options & HAS_PROMPT_FIELD) {
     prompt_field_ = new Textfield;
-    prompt_field_->SetText(prompt);
+    prompt_field_->SetText(params.default_prompt);
   }
 
   ResetLayoutManager();
 }
 
 void MessageBoxView::ResetLayoutManager() {
   // Initialize the Grid Layout Manager used for this dialog box.
   GridLayout* layout = GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
@@ skipping 58 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