Reland r14146 which refactors DialogButton into cross platform

code.  This is the same as the last change except I renamed
class MessageBox to class MessageBoxFlags to avoid conflicting
with the same name in windows.h.

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

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

1 files changed, 7 insertions, 6 deletions

diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index 5a0df99..0b00f6a 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -236,21 +236,22 @@ void ClearBrowsingDataView::ViewHierarchyChanged(bool is_add,
 // ClearBrowsingDataView, views::DialogDelegate implementation:
 
 std::wstring ClearBrowsingDataView::GetDialogButtonLabel(
-    DialogButton button) const {
-  if (button == DIALOGBUTTON_OK) {
+    MessageBoxFlags::DialogButton button) const {
+  if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
     return l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_COMMIT);
-  } else if (button == DIALOGBUTTON_CANCEL) {
+  } else if (button == MessageBoxFlags::DIALOGBUTTON_CANCEL) {
     return l10n_util::GetString(IDS_CLOSE);
   } else {
     return std::wstring();
   }
 }
 
-bool ClearBrowsingDataView::IsDialogButtonEnabled(DialogButton button) const {
+bool ClearBrowsingDataView::IsDialogButtonEnabled(
+    MessageBoxFlags::DialogButton button) const {
   if (delete_in_progress_)
     return false;
 
-  if (button == DIALOGBUTTON_OK) {
+  if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
     return del_history_checkbox_->checked() ||
            del_downloads_checkbox_->checked() ||
            del_cache_checkbox_->checked() ||
@@ -287,7 +288,7 @@ std::wstring ClearBrowsingDataView::GetWindowTitle() const {
 }
 
 bool ClearBrowsingDataView::Accept() {
-  if (!IsDialogButtonEnabled(DIALOGBUTTON_OK)) {
+  if (!IsDialogButtonEnabled(MessageBoxFlags::DIALOGBUTTON_OK)) {
     return false;
   }