Move message flags into a separate header that can be used

outside the views system.  Mac will need this as well when
implementing message boxes.

Review URL: http://codereview.chromium.org/56026

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

9 files changed, 22 insertions, 14 deletions

diff --git a/chrome/browser/download/download_request_dialog_delegate_win.cc b/chrome/browser/download/download_request_dialog_delegate_win.cc
index 2ff9a24..3f359ca 100644
--- a/chrome/browser/download/download_request_dialog_delegate_win.cc
+++ b/chrome/browser/download/download_request_dialog_delegate_win.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "grit/generated_resources.h"
 
@@ -22,7 +23,7 @@ DownloadRequestDialogDelegateWin::DownloadRequestDialogDelegateWin(
     DownloadRequestManager::TabDownloadState* host)
     : DownloadRequestDialogDelegate(host) {
   message_view_ = new MessageBoxView(
-      MessageBoxView::kIsConfirmMessageBox,
+      MessageBox::kIsConfirmMessageBox,
       l10n_util::GetString(IDS_MULTI_DOWNLOAD_WARNING),
       std::wstring());
   window_ = tab->CreateConstrainedDialog(this, message_view_);
diff --git a/chrome/browser/js_before_unload_handler_win.cc b/chrome/browser/js_before_unload_handler_win.cc
index e550018..f97620d 100644
--- a/chrome/browser/js_before_unload_handler_win.cc
+++ b/chrome/browser/js_before_unload_handler_win.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/common/l10n_util.h"
-#include "chrome/views/controls/message_box_view.h"
+#include "chrome/common/message_box_flags.h"
 #include "grit/generated_resources.h"
 
 void RunBeforeUnloadDialog(WebContents* web_contents,
@@ -31,7 +31,7 @@ JavascriptBeforeUnloadHandler::JavascriptBeforeUnloadHandler(
     IPC::Message* reply_msg)
     : JavascriptMessageBoxHandler(web_contents,
                                   frame_url,
-                                  MessageBoxView::kIsJavascriptConfirm,
+                                  MessageBox::kIsJavascriptConfirm,
                                   message_text,
                                   std::wstring(),
                                   false,
diff --git a/chrome/browser/jsmessage_box_handler_win.cc b/chrome/browser/jsmessage_box_handler_win.cc
index 1b6ef07..847f7cf 100644
--- a/chrome/browser/jsmessage_box_handler_win.cc
+++ b/chrome/browser/jsmessage_box_handler_win.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/message_box_flags.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
@@ -47,7 +48,7 @@ JavascriptMessageBoxHandler::JavascriptMessageBoxHandler(
       dialog_flags_(dialog_flags),
       dialog_(NULL),
       message_box_view_(new MessageBoxView(
-          dialog_flags | MessageBoxView::kAutoDetectAlignment,
+          dialog_flags | MessageBox::kAutoDetectAlignment,
           message_text, default_prompt_text)) {
   DCHECK(message_box_view_);
   DCHECK(reply_msg_);
@@ -73,10 +74,10 @@ JavascriptMessageBoxHandler::~JavascriptMessageBoxHandler() {
 
 int JavascriptMessageBoxHandler::GetDialogButtons() const {
   int dialog_buttons = 0;
-  if (dialog_flags_ & MessageBoxView::kFlagHasOKButton)
+  if (dialog_flags_ & MessageBox::kFlagHasOKButton)
     dialog_buttons = DIALOGBUTTON_OK;
 
-  if (dialog_flags_ & MessageBoxView::kFlagHasCancelButton)
+  if (dialog_flags_ & MessageBox::kFlagHasCancelButton)
     dialog_buttons |= DIALOGBUTTON_CANCEL;
 
   return dialog_buttons;
diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc
index 99ee16a..50cdce3 100644
--- a/chrome/browser/views/external_protocol_dialog.cc
+++ b/chrome/browser/views/external_protocol_dialog.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
@@ -103,7 +104,7 @@ ExternalProtocolDialog::ExternalProtocolDialog(TabContents* tab_contents,
 
   message_text += l10n_util::GetString(IDS_EXTERNAL_PROTOCOL_WARNING);
 
-  message_box_view_ = new MessageBoxView(MessageBoxView::kIsConfirmMessageBox,
+  message_box_view_ = new MessageBoxView(MessageBox::kIsConfirmMessageBox,
                                          message_text,
                                          L"",
                                          kMessageWidth);
diff --git a/chrome/browser/views/new_profile_dialog.cc b/chrome/browser/views/new_profile_dialog.cc
index 8b2faea..fbb9c8e 100644
--- a/chrome/browser/views/new_profile_dialog.cc
+++ b/chrome/browser/views/new_profile_dialog.cc
@@ -10,6 +10,7 @@
 #include "base/file_util.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/controls/text_field.h"
 #include "chrome/views/view.h"
@@ -29,9 +30,9 @@ NewProfileDialog::NewProfileDialog() {
       IDS_NEW_PROFILE_DIALOG_LABEL_TEXT);
   const int kDialogWidth = views::Window::GetLocalizedContentsWidth(
       IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS);
-  const int kMessageBoxFlags = MessageBoxView::kFlagHasOKButton |
-                               MessageBoxView::kFlagHasCancelButton |
-                               MessageBoxView::kFlagHasPromptField;
+  const int kMessageBoxFlags = MessageBox::kFlagHasOKButton |
+                               MessageBox::kFlagHasCancelButton |
+                               MessageBox::kFlagHasPromptField;
   message_box_view_ = new MessageBoxView(kMessageBoxFlags,
                                          message_text.c_str(),
                                          std::wstring(),
diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc
index fc258f6..fcf083b 100644
--- a/chrome/browser/views/options/advanced_page_view.cc
+++ b/chrome/browser/views/options/advanced_page_view.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/message_box_flags.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/controls/message_box_view.h"
@@ -68,7 +69,7 @@ class ResetDefaultsConfirmBox : public views::DialogDelegate {
     const int kDialogWidth = 400;
     // Also deleted when the window closes.
     message_box_view_ = new MessageBoxView(
-        MessageBoxView::kFlagHasMessage | MessageBoxView::kFlagHasOKButton,
+        MessageBox::kFlagHasMessage | MessageBox::kFlagHasOKButton,
         l10n_util::GetString(IDS_OPTIONS_RESET_MESSAGE).c_str(),
         std::wstring(),
         kDialogWidth);
diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc
index 583de4c..b8e9153 100644
--- a/chrome/browser/views/repost_form_warning_view.cc
+++ b/chrome/browser/views/repost_form_warning_view.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/message_box_flags.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
@@ -24,7 +25,7 @@ RepostFormWarningView::RepostFormWarningView(
       : navigation_controller_(navigation_controller),
         message_box_view_(NULL) {
   message_box_view_ = new MessageBoxView(
-      MessageBoxView::kIsConfirmMessageBox,
+      MessageBox::kIsConfirmMessageBox,
       l10n_util::GetString(IDS_HTTP_POST_WARNING),
       L"");
   // TODO(beng): fix this - this dialog box should be shown by a method on the
diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc
index 42f734d..e61e23f 100644
--- a/chrome/browser/views/restart_message_box.cc
+++ b/chrome/browser/views/restart_message_box.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/views/restart_message_box.h"
 
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
@@ -52,7 +53,7 @@ RestartMessageBox::RestartMessageBox(HWND parent_hwnd) {
   const int kDialogWidth = 400;
   // Also deleted when the window closes.
   message_box_view_ = new MessageBoxView(
-      MessageBoxView::kFlagHasMessage | MessageBoxView::kFlagHasOKButton,
+      MessageBox::kFlagHasMessage | MessageBox::kFlagHasOKButton,
       l10n_util::GetString(IDS_OPTIONS_RESTART_REQUIRED).c_str(),
       std::wstring(),
       kDialogWidth);
diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc
index f303f37..041ae8a 100644
--- a/chrome/browser/views/user_data_dir_dialog.cc
+++ b/chrome/browser/views/user_data_dir_dialog.cc
@@ -5,6 +5,7 @@
 #include "base/logging.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/widget/widget.h"
 #include "chrome/views/window/window.h"
@@ -26,7 +27,7 @@ UserDataDirDialog::UserDataDirDialog(const std::wstring& user_data_dir)
   std::wstring message_text = l10n_util::GetStringF(
       IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY, user_data_dir);
   const int kDialogWidth = 400;
-  message_box_view_ = new MessageBoxView(MessageBoxView::kIsConfirmMessageBox,
+  message_box_view_ = new MessageBoxView(MessageBox::kIsConfirmMessageBox,
       message_text.c_str(), std::wstring(), kDialogWidth);
 
   views::Window::CreateChromeWindow(NULL, gfx::Rect(), this)->Show();