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, 6 insertions, 4 deletions

diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index b5a2f6d..eb00198 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -80,8 +80,9 @@ void BookmarkEditorView::Show(HWND parent_hwnd,
   editor->Show(parent_hwnd);
 }
 
-bool BookmarkEditorView::IsDialogButtonEnabled(DialogButton button) const {
-  if (button == DIALOGBUTTON_OK) {
+bool BookmarkEditorView::IsDialogButtonEnabled(
+    MessageBoxFlags::DialogButton button) const {
+  if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
     const GURL url(GetInputURL());
     return bb_model_->IsLoaded() && url.is_valid();
   }
@@ -96,7 +97,7 @@ std::wstring BookmarkEditorView::GetWindowTitle() const {
 }
 
 bool BookmarkEditorView::Accept() {
-  if (!IsDialogButtonEnabled(DIALOGBUTTON_OK)) {
+  if (!IsDialogButtonEnabled(MessageBoxFlags::DIALOGBUTTON_OK)) {
     // The url is invalid, focus the url field.
     url_tf_.SelectAll();
     url_tf_.RequestFocus();
@@ -107,7 +108,8 @@ bool BookmarkEditorView::Accept() {
   return true;
 }
 
-bool BookmarkEditorView::AreAcceleratorsEnabled(DialogButton button) {
+bool BookmarkEditorView::AreAcceleratorsEnabled(
+    MessageBoxFlags::DialogButton button) {
   return !show_tree_ || !tree_view_->GetEditingNode();
 }