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

This simplifies many consumers of this API.

R=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10378086

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136804 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 24 insertions, 31 deletions

diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
index 9079800..a62f88f 100644
--- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
+++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
@@ -76,7 +76,7 @@ DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser)
       IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
 
   message_box_view_ = new views::MessageBoxView(
-      views::MessageBoxView::NO_OPTIONS, explanation_text, string16());
+      views::MessageBoxView::InitParams(explanation_text));
 }
 
 DownloadInProgressDialogView::~DownloadInProgressDialogView() {}
diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc
index 101d0a9..b446e10 100644
--- a/chrome/browser/ui/views/external_protocol_dialog.cc
+++ b/chrome/browser/ui/views/external_protocol_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -147,11 +147,9 @@ ExternalProtocolDialog::ExternalProtocolDialog(WebContents* web_contents,
 
   message_text += l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_WARNING);
 
-  message_box_view_ = new views::MessageBoxView(
-      views::MessageBoxView::NO_OPTIONS,
-      message_text,
-      string16(),
-      kMessageWidth);
+  views::MessageBoxView::InitParams params(message_text);
+  params.message_width = kMessageWidth;
+  message_box_view_ = new views::MessageBoxView(params);
   message_box_view_->SetCheckBoxLabel(
       l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT));
 
diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc
index 813d9a7..e3e1c5e 100644
--- a/chrome/browser/ui/views/js_modal_dialog_views.cc
+++ b/chrome/browser/ui/views/js_modal_dialog_views.cc
@@ -22,9 +22,10 @@ JSModalDialogViews::JSModalDialogViews(JavaScriptAppModalDialog* parent)
   if (parent->javascript_message_type() == ui::JAVASCRIPT_MESSAGE_TYPE_PROMPT)
     options |= views::MessageBoxView::HAS_PROMPT_FIELD;
 
-  message_box_view_ = new views::MessageBoxView(options,
-                                                parent->message_text(),
-                                                parent->default_prompt_text());
+  views::MessageBoxView::InitParams params(parent->message_text());
+  params.options = options;
+  params.default_prompt = parent->default_prompt_text();
+  message_box_view_ = new views::MessageBoxView(params);
   DCHECK(message_box_view_);
 
   message_box_view_->AddAccelerator(
diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc
index d567d3a..f93fbcb7 100644
--- a/chrome/browser/ui/views/simple_message_box_views.cc
+++ b/chrome/browser/ui/views/simple_message_box_views.cc
@@ -136,7 +136,7 @@ SimpleMessageBoxViews::SimpleMessageBoxViews(gfx::NativeWindow parent_window,
       dialog_type_(dialog_type),
       disposition_(DISPOSITION_UNKNOWN),
       message_box_view_(new views::MessageBoxView(
-          views::MessageBoxView::NO_OPTIONS, message, string16())) {
+          views::MessageBoxView::InitParams(message))) {
   views::Widget::CreateWindowWithParent(this, parent_window)->Show();
 
   // Add reference to be released in DeleteDelegate().
diff --git a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
index 82a7c0b..8fc46f16 100644
--- a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
+++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -33,9 +33,7 @@ TabModalConfirmDialogViews::TabModalConfirmDialogViews(
     TabContentsWrapper* wrapper)
     : delegate_(delegate),
       message_box_view_(new views::MessageBoxView(
-          views::MessageBoxView::NO_OPTIONS,
-          delegate->GetMessage(),
-          string16())) {
+          views::MessageBoxView::InitParams(delegate->GetMessage()))) {
   delegate_->set_window(new ConstrainedWindowViews(wrapper, this));
 }
 
diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc
index 981cd22..5585d1c 100644
--- a/chrome/browser/ui/views/update_recommended_message_box.cc
+++ b/chrome/browser/ui/views/update_recommended_message_box.cc
@@ -37,12 +37,11 @@ UpdateRecommendedMessageBox::UpdateRecommendedMessageBox() {
   const int kProductNameID = IDS_PRODUCT_NAME;
 #endif
   const string16 product_name = l10n_util::GetStringUTF16(kProductNameID);
+  views::MessageBoxView::InitParams params(
+      l10n_util::GetStringFUTF16(IDS_UPDATE_RECOMMENDED, product_name));
+  params.message_width = kDialogWidth;
   // Also deleted when the window closes.
-  message_box_view_ = new views::MessageBoxView(
-      views::MessageBoxView::NO_OPTIONS,
-      l10n_util::GetStringFUTF16(IDS_UPDATE_RECOMMENDED, product_name),
-      string16(),
-      kDialogWidth);
+  message_box_view_ = new views::MessageBoxView(params);
 }
 
 UpdateRecommendedMessageBox::~UpdateRecommendedMessageBox() {
diff --git a/chrome/browser/ui/views/user_data_dir_dialog.cc b/chrome/browser/ui/views/user_data_dir_dialog.cc
index da053544..430f43b 100644
--- a/chrome/browser/ui/views/user_data_dir_dialog.cc
+++ b/chrome/browser/ui/views/user_data_dir_dialog.cc
@@ -15,24 +15,21 @@
 FilePath UserDataDirDialog::RunUserDataDirDialog(
     const FilePath& user_data_dir) {
   // When the window closes, it will delete itself.
-  UserDataDirDialog* dlg = new UserDataDirDialog(user_data_dir);
-  MessageLoopForUI::current()->RunWithDispatcher(dlg);
-  return dlg->user_data_dir();
+  UserDataDirDialog* dialog = new UserDataDirDialog(user_data_dir);
+  MessageLoopForUI::current()->RunWithDispatcher(dialog);
+  return dialog->user_data_dir();
 }
 
 UserDataDirDialog::UserDataDirDialog(const FilePath& user_data_dir)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           select_file_dialog_(SelectFileDialog::Create(this))),
       is_blocking_(true) {
-  string16 message_text = l10n_util::GetStringFUTF16(
-      IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY,
-      user_data_dir.LossyDisplayName());
   const int kDialogWidth = 400;
-  message_box_view_ = new views::MessageBoxView(
-      views::MessageBoxView::NO_OPTIONS,
-      message_text,
-      string16(),
-      kDialogWidth);
+  views::MessageBoxView::InitParams params(
+      l10n_util::GetStringFUTF16(IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY,
+                                 user_data_dir.LossyDisplayName()));
+  params.message_width = kDialogWidth;
+  message_box_view_ = new views::MessageBoxView(params);
 
   views::Widget::CreateWindow(this)->Show();
 }