diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 23:49:18 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 23:49:18 +0000 |
| commit | 478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d (patch) | |
| tree | f995985b8749bd31da7cbb73ec73cfce24e97987 /chrome/browser/download | |
| parent | 69e38eca8034fe35c22744f59bee77f987ae8755 (diff) | |
| download | chromium_src-478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d.zip chromium_src-478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d.tar.gz chromium_src-478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/download')
3 files changed, 12 insertions, 6 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..bc68b990 100644 --- a/chrome/browser/download/download_request_dialog_delegate_win.cc +++ b/chrome/browser/download/download_request_dialog_delegate_win.cc @@ -23,7 +23,7 @@ DownloadRequestDialogDelegateWin::DownloadRequestDialogDelegateWin( DownloadRequestManager::TabDownloadState* host) : DownloadRequestDialogDelegate(host) { message_view_ = new MessageBoxView( - MessageBox::kIsConfirmMessageBox, + MessageBoxFlags::kIsConfirmMessageBox, l10n_util::GetString(IDS_MULTI_DOWNLOAD_WARNING), std::wstring()); window_ = tab->CreateConstrainedDialog(this, message_view_); @@ -46,10 +46,10 @@ views::View* DownloadRequestDialogDelegateWin::GetContentsView() { } std::wstring DownloadRequestDialogDelegateWin::GetDialogButtonLabel( - DialogButton button) const { - if (button == DIALOGBUTTON_OK) + MessageBoxFlags::DialogButton button) const { + if (button == MessageBoxFlags::DIALOGBUTTON_OK) return l10n_util::GetString(IDS_MULTI_DOWNLOAD_WARNING_ALLOW); - if (button == DIALOGBUTTON_CANCEL) + if (button == MessageBoxFlags::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..f0167e6 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( + MessageBoxFlags::DialogButton button) const; virtual int GetDefaultDialogButton() const { - return DIALOGBUTTON_CANCEL; + return MessageBoxFlags::DIALOGBUTTON_CANCEL; } virtual void DeleteDelegate(); diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc index debf209..5310252 100644 --- a/chrome/browser/download/download_uitest.cc +++ b/chrome/browser/download/download_uitest.cc @@ -5,6 +5,11 @@ #include <sstream> #include <string> +#include "build/build_config.h" +#if defined(OS_WIN) +#include <shlwapi.h> +#endif + #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" |