From 478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Tue, 21 Apr 2009 23:49:18 +0000 Subject: 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 --- chrome/browser/views/options/advanced_page_view.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'chrome/browser/views/options/advanced_page_view.cc') diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc index fcf083b..20d8616 100644 --- a/chrome/browser/views/options/advanced_page_view.cc +++ b/chrome/browser/views/options/advanced_page_view.cc @@ -36,14 +36,12 @@ class ResetDefaultsConfirmBox : public views::DialogDelegate { protected: // views::DialogDelegate - virtual int GetDialogButtons() const { - return DIALOGBUTTON_OK | DIALOGBUTTON_CANCEL; - } - virtual std::wstring GetDialogButtonLabel(DialogButton button) const { + virtual std::wstring GetDialogButtonLabel( + MessageBoxFlags::DialogButton button) const { switch (button) { - case DIALOGBUTTON_OK: + case MessageBoxFlags::DIALOGBUTTON_OK: return l10n_util::GetString(IDS_OPTIONS_RESET_OKLABEL); - case DIALOGBUTTON_CANCEL: + case MessageBoxFlags::DIALOGBUTTON_CANCEL: return l10n_util::GetString(IDS_OPTIONS_RESET_CANCELLABEL); default: break; @@ -69,7 +67,7 @@ class ResetDefaultsConfirmBox : public views::DialogDelegate { const int kDialogWidth = 400; // Also deleted when the window closes. message_box_view_ = new MessageBoxView( - MessageBox::kFlagHasMessage | MessageBox::kFlagHasOKButton, + MessageBoxFlags::kFlagHasMessage | MessageBoxFlags::kFlagHasOKButton, l10n_util::GetString(IDS_OPTIONS_RESET_MESSAGE).c_str(), std::wstring(), kDialogWidth); -- cgit v1.1