views: Move DialogButton enum into ui/base/ and put it into the ui na…

…mespace.

R=sky@chromium.org

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

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

chrome/browser/automation/testing_automation_provider.cc

@@ -103,13 +103,13 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_view_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/extensions/url_pattern_set.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/common/chrome_view_types.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ -120,7 +120,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/base/events.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/base/message_box_flags.h"
+#include "ui/base/ui_base_types.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/plugins/webplugininfo.h"
 
@@ -2077,15 +2077,15 @@ void TestingAutomationProvider::GetShowingAppModalDialog(bool* showing_dialog,
       AppModalDialogQueue::GetInstance()->active_dialog();
   if (!active_dialog) {
     *showing_dialog = false;
-    *dialog_button = ui::MessageBoxFlags::DIALOGBUTTON_NONE;
+    *dialog_button = ui::DIALOG_BUTTON_NONE;
     return;
   }
   NativeAppModalDialog* native_dialog = active_dialog->native_dialog();
   *showing_dialog = (native_dialog != NULL);
   if (*showing_dialog)
     *dialog_button = native_dialog->GetAppModalDialogButtons();
   else
-    *dialog_button = ui::MessageBoxFlags::DIALOGBUTTON_NONE;
+    *dialog_button = ui::DIALOG_BUTTON_NONE;
 }
 
 void TestingAutomationProvider::ClickAppModalDialogButton(int button,
@@ -2096,13 +2096,11 @@ void TestingAutomationProvider::ClickAppModalDialogButton(int button,
       AppModalDialogQueue::GetInstance()->active_dialog()->native_dialog();
   if (native_dialog &&
       (native_dialog->GetAppModalDialogButtons() & button) == button) {
-    if ((button & ui::MessageBoxFlags::DIALOGBUTTON_OK) ==
-        ui::MessageBoxFlags::DIALOGBUTTON_OK) {
+    if ((button & ui::DIALOG_BUTTON_OK) == ui::DIALOG_BUTTON_OK) {
       native_dialog->AcceptAppModalDialog();
       *success =  true;
     }
-    if ((button & ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) ==
-        ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) {
+    if ((button & ui::DIALOG_BUTTON_CANCEL) == ui::DIALOG_BUTTON_CANCEL) {
       DCHECK(!*success) << "invalid param, OK and CANCEL specified";
       native_dialog->CancelAppModalDialog();
       *success =  true;

chrome/browser/chromeos/external_protocol_dialog.cc

@@ -49,11 +49,11 @@ ExternalProtocolDialog::~ExternalProtocolDialog() {
 // ExternalProtocolDialog, views::DialogDelegate implementation:
 
 int ExternalProtocolDialog::GetDialogButtons() const {
-  return ui::MessageBoxFlags::DIALOGBUTTON_OK;
+  return ui::DIALOG_BUTTON_OK;
 }
 
 string16 ExternalProtocolDialog::GetDialogButtonLabel(
-    ui::MessageBoxFlags::DialogButton button) const {
+    ui::DialogButton button) const {
   return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_OK_BUTTON_TEXT);
 }
 

chrome/browser/chromeos/external_protocol_dialog.h

@@ -31,8 +31,7 @@ class ExternalProtocolDialog : public views::DialogDelegate {
 
   // views::DialogDelegate Methods:
   virtual int GetDialogButtons() const OVERRIDE;
-  virtual string16 GetDialogButtonLabel(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
+  virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
   virtual bool Accept() OVERRIDE;

chrome/browser/chromeos/login/eula_view.cc

@@ -98,7 +98,7 @@ class TpmInfoView : public views::DialogDelegateView {
   virtual bool IsModal() const OVERRIDE { return true; }
   virtual views::View* GetContentsView() OVERRIDE { return this; }
   virtual int GetDialogButtons() const OVERRIDE {
-    return ui::MessageBoxFlags::DIALOGBUTTON_OK;
+    return ui::DIALOG_BUTTON_OK;
   }
 
   // views::View overrides:

chrome/browser/chromeos/login/password_changed_view.cc

@@ -50,7 +50,7 @@ bool PasswordChangedView::Accept() {
 }
 
 int PasswordChangedView::GetDialogButtons() const {
-  return ui::MessageBoxFlags::DIALOGBUTTON_OK;
+  return ui::DIALOG_BUTTON_OK;
 }
 
 views::View* PasswordChangedView::GetInitiallyFocusedView() {

chrome/browser/chromeos/options/network_config_view.cc

@@ -62,16 +62,15 @@ gfx::NativeWindow NetworkConfigView::GetNativeWindow() const {
 }
 
 string16 NetworkConfigView::GetDialogButtonLabel(
-    ui::MessageBoxFlags::DialogButton button) const {
-  if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK)
+    ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_OK)
     return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_CONNECT);
   return string16();
 }
 
-bool NetworkConfigView::IsDialogButtonEnabled(
-    ui::MessageBoxFlags::DialogButton button) const {
+bool NetworkConfigView::IsDialogButtonEnabled(ui::DialogButton button) const {
   // Disable connect button if cannot login.
-  if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK)
+  if (button == ui::DIALOG_BUTTON_OK)
     return child_config_view_->CanLogin();
   return true;
 }

chrome/browser/chromeos/options/network_config_view.h

@@ -49,10 +49,8 @@ class NetworkConfigView : public views::DialogDelegateView,
   gfx::NativeWindow GetNativeWindow() const;
 
   // views::DialogDelegate methods.
-  virtual string16 GetDialogButtonLabel(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
-  virtual bool IsDialogButtonEnabled(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
+  virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
+  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual views::View* GetExtraView() OVERRIDE;

chrome/browser/chromeos/options/take_photo_dialog.cc

@@ -41,11 +41,10 @@ TakePhotoDialog::TakePhotoDialog(Delegate* delegate)
 TakePhotoDialog::~TakePhotoDialog() {
 }
 
-bool TakePhotoDialog::IsDialogButtonEnabled(
-    ui::MessageBoxFlags::DialogButton button) const {
-  if (button == ui::MessageBoxFlags::DIALOGBUTTON_CANCEL)
+bool TakePhotoDialog::IsDialogButtonEnabled(ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_CANCEL)
     return true;
-  else if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK)
+  else if (button == ui::DIALOG_BUTTON_OK)
     return !take_photo_view_->is_capturing();
   NOTREACHED();
   return false;

chrome/browser/chromeos/options/take_photo_dialog.h

@@ -38,8 +38,7 @@ class TakePhotoDialog : public views::DialogDelegateView,
   virtual ~TakePhotoDialog();
 
   // views::DialogDelegateView overrides.
-  virtual bool IsDialogButtonEnabled(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
+  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 

chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm

@@ -15,6 +15,7 @@
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/message_box_flags.h"
+#include "ui/base/ui_base_types.h"
 
 // Helper object that receives the notification that the dialog/sheet is
 // going away. Is responsible for cleaning itself up.
@@ -166,10 +167,9 @@ - (void)alertDidEnd:(NSAlert*)alert
   int num_buttons = [[alert_ buttons] count];
   switch (num_buttons) {
     case 1:
-      return ui::MessageBoxFlags::DIALOGBUTTON_OK;
+      return ui::DIALOG_BUTTON_OK;
     case 2:
-      return ui::MessageBoxFlags::DIALOGBUTTON_OK |
-             ui::MessageBoxFlags::DIALOGBUTTON_CANCEL;
+      return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
     default:
       NOTREACHED();
       return 0;

chrome/browser/ui/gtk/js_modal_dialog_gtk.cc

@@ -14,6 +14,7 @@
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/message_box_flags.h"
+#include "ui/base/ui_base_types.h"
 
 namespace {
 
@@ -149,14 +150,13 @@ JSModalDialogGtk::~JSModalDialogGtk() {
 int JSModalDialogGtk::GetAppModalDialogButtons() const {
   switch (dialog_->dialog_flags()) {
     case ui::MessageBoxFlags::kIsJavascriptAlert:
-      return ui::MessageBoxFlags::DIALOGBUTTON_OK;
+      return ui::DIALOG_BUTTON_OK;
 
     case ui::MessageBoxFlags::kIsJavascriptConfirm:
-      return ui::MessageBoxFlags::DIALOGBUTTON_OK |
-        ui::MessageBoxFlags::DIALOGBUTTON_CANCEL;
+      return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 
     case ui::MessageBoxFlags::kIsJavascriptPrompt:
-      return ui::MessageBoxFlags::DIALOGBUTTON_OK;
+      return ui::DIALOG_BUTTON_OK;
 
     default:
       NOTREACHED();

chrome/browser/ui/input_window_dialog_win.cc

@@ -71,10 +71,8 @@ class ContentView : public views::DialogDelegateView,
   explicit ContentView(InputWindowDialogWin* delegate);
 
   // views::DialogDelegateView:
-  virtual string16 GetDialogButtonLabel(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
-  virtual bool IsDialogButtonEnabled(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
+  virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
+  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
@@ -125,19 +123,17 @@ ContentView::ContentView(InputWindowDialogWin* delegate)
 ///////////////////////////////////////////////////////////////////////////////
 // ContentView, views::DialogDelegate implementation:
 
-string16 ContentView::GetDialogButtonLabel(
-      ui::MessageBoxFlags::DialogButton button) const {
-  if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) {
+string16 ContentView::GetDialogButtonLabel(ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_OK) {
     return l10n_util::GetStringUTF16(
         delegate_->type() == InputWindowDialog::BUTTON_TYPE_ADD ? IDS_ADD
                                                                 : IDS_SAVE);
   }
   return string16();
 }
 
-bool ContentView::IsDialogButtonEnabled(
-    ui::MessageBoxFlags::DialogButton button) const {
-  if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK &&
+bool ContentView::IsDialogButtonEnabled(ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_OK &&
       !delegate_->delegate()->IsValid(text_field_->text())) {
     return false;
   }

chrome/browser/ui/login/login_prompt_win.cc

@@ -45,8 +45,8 @@ class LoginHandlerWin : public LoginHandler,
 
   // views::DialogDelegate methods:
   virtual string16 GetDialogButtonLabel(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE {
-    if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK)
+      ui::DialogButton button) const OVERRIDE {
+    if (button == ui::DIALOG_BUTTON_OK)
       return l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_OK_BUTTON_LABEL);
     return DialogDelegate::GetDialogButtonLabel(button);
   }

chrome/browser/ui/views/about_chrome_view.cc

@@ -529,11 +529,10 @@ void AboutChromeView::ViewHierarchyChanged(bool is_add,
 ////////////////////////////////////////////////////////////////////////////////
 // AboutChromeView, views::DialogDelegate implementation:
 
-string16 AboutChromeView::GetDialogButtonLabel(
-    ui::MessageBoxFlags::DialogButton button) const {
-  if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) {
+string16 AboutChromeView::GetDialogButtonLabel(ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_OK) {
     return l10n_util::GetStringUTF16(IDS_RELAUNCH_AND_UPDATE);
-  } else if (button == ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) {
+  } else if (button == ui::DIALOG_BUTTON_CANCEL) {
     if (restart_button_visible_)
       return l10n_util::GetStringUTF16(IDS_NOT_NOW);
     // The OK button (which is the default button) has been re-purposed to be
@@ -550,19 +549,15 @@ string16 AboutChromeView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE);
 }
 
-bool AboutChromeView::IsDialogButtonEnabled(
-    ui::MessageBoxFlags::DialogButton button) const {
-  if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK &&
-      !restart_button_visible_)
+bool AboutChromeView::IsDialogButtonEnabled(ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_OK && !restart_button_visible_)
     return false;
 
   return true;
 }
 
-bool AboutChromeView::IsDialogButtonVisible(
-    ui::MessageBoxFlags::DialogButton button) const {
-  if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK &&
-      !restart_button_visible_)
+bool AboutChromeView::IsDialogButtonVisible(ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_OK && !restart_button_visible_)
     return false;
 
   return true;
@@ -573,7 +568,7 @@ bool AboutChromeView::IsDialogButtonVisible(
 // OK button (which is the dialog cancel button, see GetDialogButtonLabel
 // above).
 int AboutChromeView::GetDefaultDialogButton() const {
-  return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL;
+  return ui::DIALOG_BUTTON_CANCEL;
 }
 
 bool AboutChromeView::CanResize() const {

chrome/browser/ui/views/about_chrome_view.h

@@ -56,12 +56,9 @@ class AboutChromeView : public views::DialogDelegateView,
                                     views::View* child) OVERRIDE;
 
   // Overridden from views::DialogDelegate:
-  virtual string16 GetDialogButtonLabel(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
-  virtual bool IsDialogButtonEnabled(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
-  virtual bool IsDialogButtonVisible(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
+  virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
+  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
+  virtual bool IsDialogButtonVisible(ui::DialogButton button) const OVERRIDE;
   virtual int GetDefaultDialogButton() const OVERRIDE;
   virtual bool CanResize() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;

chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

@@ -88,14 +88,13 @@ BookmarkEditorView::~BookmarkEditorView() {
 }
 
 string16 BookmarkEditorView::GetDialogButtonLabel(
-      ui::MessageBoxFlags::DialogButton button) const {
-  if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK)
+      ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_OK)
     return l10n_util::GetStringUTF16(IDS_SAVE);
   return string16();
 }
-bool BookmarkEditorView::IsDialogButtonEnabled(
-    ui::MessageBoxFlags::DialogButton button) const {
-  if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) {
+bool BookmarkEditorView::IsDialogButtonEnabled(ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_OK) {
     if (details_.type == EditDetails::NEW_FOLDER)
       return !title_tf_.text().empty();
 
@@ -118,7 +117,7 @@ string16 BookmarkEditorView::GetWindowTitle() const {
 }
 
 bool BookmarkEditorView::Accept() {
-  if (!IsDialogButtonEnabled(ui::MessageBoxFlags::DIALOGBUTTON_OK)) {
+  if (!IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK)) {
     if (details_.type != EditDetails::NEW_FOLDER) {
       // The url is invalid, focus the url field.
       url_tf_->SelectAll();
@@ -131,8 +130,7 @@ bool BookmarkEditorView::Accept() {
   return true;
 }
 
-bool BookmarkEditorView::AreAcceleratorsEnabled(
-    ui::MessageBoxFlags::DialogButton button) {
+bool BookmarkEditorView::AreAcceleratorsEnabled(ui::DialogButton button) {
   return !show_tree_ || !tree_view_->GetEditingNode();
 }
 

chrome/browser/ui/views/bookmarks/bookmark_editor_view.h

@@ -81,16 +81,13 @@ class BookmarkEditorView : public BookmarkEditor,
   virtual ~BookmarkEditorView();
 
   // views::DialogDelegateView:
-  virtual string16 GetDialogButtonLabel(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
-  virtual bool IsDialogButtonEnabled(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
+  virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
+  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
   virtual bool IsModal() const OVERRIDE;
   virtual bool CanResize() const  OVERRIDE;
   virtual string16 GetWindowTitle() const  OVERRIDE;
   virtual bool Accept() OVERRIDE;
-  virtual bool AreAcceleratorsEnabled(
-      ui::MessageBoxFlags::DialogButton button) OVERRIDE;
+  virtual bool AreAcceleratorsEnabled(ui::DialogButton button) OVERRIDE;
   virtual views::View* GetContentsView()  OVERRIDE;
 
   // views::View:

chrome/browser/ui/views/collected_cookies_win.cc

@@ -360,11 +360,11 @@ string16 CollectedCookiesWin::GetWindowTitle() const {
 }
 
 int CollectedCookiesWin::GetDialogButtons() const {
-  return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL;
+  return ui::DIALOG_BUTTON_CANCEL;
 }
 
 string16 CollectedCookiesWin::GetDialogButtonLabel(
-    ui::MessageBoxFlags::DialogButton button) const {
+    ui::DialogButton button) const {
   return l10n_util::GetStringUTF16(IDS_CLOSE);
 }
 

chrome/browser/ui/views/collected_cookies_win.h

@@ -46,8 +46,7 @@ class CollectedCookiesWin : public views::DialogDelegate,
   // views::DialogDelegate:
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual int GetDialogButtons() const OVERRIDE;
-  virtual string16 GetDialogButtonLabel(
-      ui::MessageBoxFlags::DialogButton button) const OVERRIDE;
+  virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;