Convert MessageBoxFlags class into an enum.

chrome/browser/ui/views/simple_message_box_views.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 "chrome/browser/ui/views/simple_message_box_views.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/simple_message_box.h"
 #include "chrome/browser/ui/views/window.h"
@@ skipping 23 matching lines @@
 
 }  // namespace browser
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMessageBoxViews, public:
 
 // static
 void SimpleMessageBoxViews::ShowErrorBox(gfx::NativeWindow parent_window,
                                          const string16& title,
                                          const string16& message) {
-  int dialog_flags = ui::MessageBoxFlags::kFlagHasMessage |
-      ui::MessageBoxFlags::kFlagHasOKButton;
+  int dialog_flags = ui::MESSAGE_BOX_HAS_MESSAGE |

[tfarina, 2011/11/12 12:40:22]

this should be ui::MessageBoxFlags::kIsJavascriptAlert

+                     ui::MESSAGE_BOX_HAS_OK_BUTTON;
 
   // This is a reference counted object so it is given an initial increment
   // in the constructor with a corresponding decrement in DeleteDelegate().
   new SimpleMessageBoxViews(parent_window, dialog_flags, title, message);
 }
 
 bool SimpleMessageBoxViews::ShowYesNoBox(gfx::NativeWindow parent_window,
                                          const string16& title,
                                          const string16& message) {
-  int dialog_flags = ui::MessageBoxFlags::kIsConfirmMessageBox;
+  int dialog_flags = ui::MESSAGE_BOX_IS_CONFIRM_DIALOG;
 
   // This is a reference counted object so it is given an initial increment
   // in the constructor plus an extra one below to ensure the dialog persists
   // until we retrieve the user response..
   scoped_refptr<SimpleMessageBoxViews> dialog =
       new SimpleMessageBoxViews(parent_window, dialog_flags, title, message);
 
   // Make sure Chrome doesn't attempt to shut down with the dialog up.
   g_browser_process->AddRefModule();
 
@@ skipping 13 matching lines @@
 }
 
 bool SimpleMessageBoxViews::Accept() {
   disposition_ = DISPOSITION_OK;
   return true;
 }
 
 int SimpleMessageBoxViews::GetDialogButtons() const {
   // NOTE: It seems unsafe to assume that the flags for OK/cancel will always
   // have the same value as the button ids.
-  return (dialog_flags_ & ui::MessageBoxFlags::kFlagHasOKButton
+  return (dialog_flags_ & ui::MESSAGE_BOX_HAS_OK_BUTTON
       ? ui::DIALOG_BUTTON_OK : 0) |
-      (dialog_flags_ & ui::MessageBoxFlags::kFlagHasCancelButton
+      (dialog_flags_ & ui::MESSAGE_BOX_HAS_CANCEL_BUTTON
           ? ui::DIALOG_BUTTON_CANCEL : 0);
 }
 
 string16 SimpleMessageBoxViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return button == ui::DIALOG_BUTTON_OK ? l10n_util::GetStringUTF16(IDS_OK)
                                         : l10n_util::GetStringUTF16(IDS_CLOSE);
 }
 
 bool SimpleMessageBoxViews::ShouldShowWindowTitle() const {
@@ skipping 61 matching lines @@
   if (disposition_ == DISPOSITION_UNKNOWN)
     return base::MessagePumpDispatcher::EVENT_PROCESSED;
   return base::MessagePumpDispatcher::EVENT_QUIT;
 }
 #else
 bool SimpleMessageBoxViews::Dispatch(GdkEvent* event) {
   gtk_main_do_event(event);
   return disposition_ == DISPOSITION_UNKNOWN;
 }
 #endif