Refactor DialogDelegate so the DialogButton enum is in cross platform

code.

This is mostly a find & replace in our code to use the new location
of the enum.

I also deleted some GetDialogButtons methods in child classes
because they were identical to the parent version in DialogDelegate.

This will allow more code to be enabled on linux/mac in the
automation provider.

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

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

2 files changed, 6 insertions, 5 deletions

diff --git a/chrome/browser/download/download_request_dialog_delegate_win.cc b/chrome/browser/download/download_request_dialog_delegate_win.cc
index 3f359ca..767bfee 100644
--- a/chrome/browser/download/download_request_dialog_delegate_win.cc
+++ b/chrome/browser/download/download_request_dialog_delegate_win.cc
@@ -46,10 +46,10 @@ views::View* DownloadRequestDialogDelegateWin::GetContentsView() {
 }
 
 std::wstring DownloadRequestDialogDelegateWin::GetDialogButtonLabel(
-    DialogButton button) const {
-  if (button == DIALOGBUTTON_OK)
+    MessageBox::DialogButton button) const {
+  if (button == MessageBox::DIALOGBUTTON_OK)
     return l10n_util::GetString(IDS_MULTI_DOWNLOAD_WARNING_ALLOW);
-  if (button == DIALOGBUTTON_CANCEL)
+  if (button == MessageBox::DIALOGBUTTON_CANCEL)
     return l10n_util::GetString(IDS_MULTI_DOWNLOAD_WARNING_DENY);
   return std::wstring();
 }
diff --git a/chrome/browser/download/download_request_dialog_delegate_win.h b/chrome/browser/download/download_request_dialog_delegate_win.h
index 7e5f83f..df3dd01 100644
--- a/chrome/browser/download/download_request_dialog_delegate_win.h
+++ b/chrome/browser/download/download_request_dialog_delegate_win.h
@@ -32,9 +32,10 @@ class DownloadRequestDialogDelegateWin : public DownloadRequestDialogDelegate,
   virtual bool Cancel();
   virtual bool Accept();
   virtual views::View* GetContentsView();
-  virtual std::wstring GetDialogButtonLabel(DialogButton button) const;
+  virtual std::wstring GetDialogButtonLabel(
+      MessageBox::DialogButton button) const;
   virtual int GetDefaultDialogButton() const {
-    return DIALOGBUTTON_CANCEL;
+    return MessageBox::DIALOGBUTTON_CANCEL;
   }
   virtual void DeleteDelegate();