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/views/importing_progress_view.cc | |
| 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/views/importing_progress_view.cc')
| -rw-r--r-- | chrome/browser/views/importing_progress_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc index d7dcf81..cac8043 100644 --- a/chrome/browser/views/importing_progress_view.cc +++ b/chrome/browser/views/importing_progress_view.cc @@ -182,12 +182,12 @@ void ImportingProgressView::ViewHierarchyChanged(bool is_add, // ImportingProgressView, views::DialogDelegate implementation: int ImportingProgressView::GetDialogButtons() const { - return DIALOGBUTTON_CANCEL; + return MessageBoxFlags::DIALOGBUTTON_CANCEL; } std::wstring ImportingProgressView::GetDialogButtonLabel( - DialogButton button) const { - DCHECK(button == DIALOGBUTTON_CANCEL); + MessageBoxFlags::DialogButton button) const { + DCHECK(button == MessageBoxFlags::DIALOGBUTTON_CANCEL); return l10n_util::GetString(IDS_IMPORT_PROGRESS_STATUS_CANCEL); } |