Move message flags into a separate header that can be used

chrome/browser/jsmessage_box_handler_win.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/jsmessage_box_handler_win.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #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"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/controls/message_box_view.h"
 #include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 
 void RunJavascriptMessageBox(WebContents* web_contents,
                              const GURL& frame_url,
@@ skipping 16 matching lines @@
     const std::wstring& message_text,
     const std::wstring& default_prompt_text,
     bool display_suppress_checkbox,
     IPC::Message* reply_msg)
     : web_contents_(web_contents),
       frame_url_(frame_url),
       reply_msg_(reply_msg),
       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_);
 
   if (display_suppress_checkbox) {
     message_box_view_->SetCheckBoxLabel(
         l10n_util::GetString(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION));
   }
 
   // Make sure we get navigation notifications so we know when our parent
   // contents will disappear or navigate to a different page.
   registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
                  NotificationService::AllSources());
 }
 
 JavascriptMessageBoxHandler::~JavascriptMessageBoxHandler() {
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // JavascriptMessageBoxHandler, views::DialogDelegate implementation:
 
 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;
 }
 
 std::wstring JavascriptMessageBoxHandler::GetWindowTitle() const {
   if (!frame_url_.has_host())
     return l10n_util::GetString(IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE);
 
   // We really only want the scheme, hostname, and port.
@@ skipping 112 matching lines @@
     web_contents_gone = true;
 
   if (web_contents_gone) {
     web_contents_ = NULL;
 
     // If the dialog is visible close it.
     if (dialog_)
       dialog_->Close();
   }
 }