views: Add an Options enum to MessageBoxView control.

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/dialog_style.h"
 #include "chrome/browser/ui/views/window.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/message_box_flags.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/views/focus/accelerator_handler.h"
 #endif
 
 namespace browser {
 
 void ShowErrorBox(gfx::NativeWindow parent,
@@ skipping 10 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;
-
   // 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);
+  new SimpleMessageBoxViews(parent_window, DIALOG_ERROR, title, message);
 }
 
 bool SimpleMessageBoxViews::ShowYesNoBox(gfx::NativeWindow parent_window,
                                          const string16& title,
                                          const string16& message) {
-  int dialog_flags = ui::MessageBoxFlags::kIsConfirmMessageBox;
-
   // 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);
+      new SimpleMessageBoxViews(parent_window, DIALOG_YES_NO, title, message);
 
   // Make sure Chrome doesn't attempt to shut down with the dialog up.
   g_browser_process->AddRefModule();
 
   bool old_state = MessageLoopForUI::current()->NestableTasksAllowed();
   MessageLoopForUI::current()->SetNestableTasksAllowed(true);
   MessageLoopForUI::current()->RunWithDispatcher(dialog);
   MessageLoopForUI::current()->SetNestableTasksAllowed(old_state);
 
   g_browser_process->ReleaseModule();
 
   return dialog->Accepted();
 }
 
 bool SimpleMessageBoxViews::Cancel() {
   disposition_ = DISPOSITION_CANCEL;
   return true;
 }
 
 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.
-  int dialog_buttons = ui::DIALOG_BUTTON_NONE;
-  if (dialog_flags_ & ui::MessageBoxFlags::kFlagHasOKButton)
-    dialog_buttons = ui::DIALOG_BUTTON_OK;
-
-  if (dialog_flags_ & ui::MessageBoxFlags::kFlagHasCancelButton)
-    dialog_buttons |= ui::DIALOG_BUTTON_CANCEL;
-
-  return dialog_buttons;
+  if (type_ == DIALOG_ERROR)
+    return ui::DIALOG_BUTTON_OK;
+  return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 }
 
 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 {
   return true;
@@ skipping 20 matching lines @@
 }
 
 const views::Widget* SimpleMessageBoxViews::GetWidget() const {
   return message_box_view_->GetWidget();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMessageBoxViews, private:
 
 SimpleMessageBoxViews::SimpleMessageBoxViews(gfx::NativeWindow parent_window,
-                                             int dialog_flags,
+                                             DialogType type,
                                              const string16& title,
                                              const string16& message)
-    : dialog_flags_(dialog_flags),
+    : type_(type),
       disposition_(DISPOSITION_UNKNOWN) {
   message_box_title_ = title;
-  message_box_view_ = new views::MessageBoxView(dialog_flags,
-                                                message,
-                                                string16());
+  message_box_view_ = new views::MessageBoxView(
+      views::MessageBoxView::NO_OPTIONS,
+      message,
+      string16());
   browser::CreateViewsWindow(parent_window, this, STYLE_GENERIC)->Show();
 
   // Add reference to be released in DeleteDelegate().
   AddRef();
 }
 
 SimpleMessageBoxViews::~SimpleMessageBoxViews() {
 }
 
 #if defined(OS_WIN)
@@ skipping 11 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