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

2 files changed, 10 insertions, 13 deletions

diff --git a/chrome/common/message_box_flags.h b/chrome/common/message_box_flags.h
index 40047d9..8520c56 100644
--- a/chrome/common/message_box_flags.h
+++ b/chrome/common/message_box_flags.h
@@ -10,7 +10,7 @@
 // This class contains flags used to communicate the type of message box
 // to show.  E.g., the renderer can request the browser to show a
 // javascript alert or a javascript confirm message.
-class MessageBox {
+class MessageBoxFlags {
  public:
   static const int kFlagHasOKButton = 0x1;
   static const int kFlagHasCancelButton = 0x2;
@@ -42,9 +42,16 @@ class MessageBox {
   static const int kIsJavascriptPrompt = kIsJavascriptConfirm |
                                          kFlagHasPromptField;
 
+  // Dialog button identifiers used to specify which buttons to show the user.
+  enum DialogButton {
+    DIALOGBUTTON_NONE = 0,    // No dialog buttons, for WindowType == WINDOW.
+    DIALOGBUTTON_OK = 1,      // Has an OK button.
+    DIALOGBUTTON_CANCEL = 2,  // Has a Cancel button (becomes a Close button if
+  };                          // no OK button).
+
  private:
-  MessageBox() {}
-  DISALLOW_COPY_AND_ASSIGN(MessageBox);
+  MessageBoxFlags() {}
+  DISALLOW_COPY_AND_ASSIGN(MessageBoxFlags);
 };
 
 #endif  // CHROME_COMMON_MESSAGE_BOX_FLAGS_H_
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 8d2fbff..4dcb220 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -119,16 +119,6 @@ void AutomationProvider::OnMessageFromExternalHost(
   NOTIMPLEMENTED();
 }
 
-void AutomationProvider::GetShowingAppModalDialog(bool* showing_dialog,
-                                                  int* dialog_button) {
-  NOTIMPLEMENTED();
-}
-
-void AutomationProvider::ClickAppModalDialogButton(int button, bool* success) {
-  *success = false;
-  NOTIMPLEMENTED();
-}
-
 //--------------------------------------------------------------------------
 
 bool ShellIntegration::SetAsDefaultBrowser() {