diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 22:07:23 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 22:07:23 +0000 |
| commit | bf9934764c182370321c818c050dd6f7087dbc2c (patch) | |
| tree | 039f69d02c5ed074b973d8ba5f3f749f5ab6abc1 /views | |
| parent | 1ec27eb5b20f25e423b05d457c47115c296ce13d (diff) | |
| download | chromium_src-bf9934764c182370321c818c050dd6f7087dbc2c.zip chromium_src-bf9934764c182370321c818c050dd6f7087dbc2c.tar.gz chromium_src-bf9934764c182370321c818c050dd6f7087dbc2c.tar.bz2 | |
views: Remove using declaration from dialog_delegate.h header file.
R=sky@chromium.org
Review URL: http://codereview.chromium.org/8450001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/view_unittest.cc | 2 | ||||
| -rw-r--r-- | views/window/dialog_delegate.cc | 16 | ||||
| -rw-r--r-- | views/window/dialog_delegate.h | 3 |
3 files changed, 9 insertions, 12 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 59384b1..9b949b5 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -1253,7 +1253,7 @@ class TestDialog : public DialogDelegate, public ButtonListener { // DialogDelegate implementation: virtual int GetDefaultDialogButton() const OVERRIDE { - return MessageBoxFlags::DIALOGBUTTON_OK; + return ui::MessageBoxFlags::DIALOGBUTTON_OK; } virtual View* GetContentsView() OVERRIDE { diff --git a/views/window/dialog_delegate.cc b/views/window/dialog_delegate.cc index 8f1917b..895ba81 100644 --- a/views/window/dialog_delegate.cc +++ b/views/window/dialog_delegate.cc @@ -42,11 +42,11 @@ bool DialogDelegate::GetSizeExtraViewHeightToButtons() { } int DialogDelegate::GetDefaultDialogButton() const { - if (GetDialogButtons() & MessageBoxFlags::DIALOGBUTTON_OK) - return MessageBoxFlags::DIALOGBUTTON_OK; - if (GetDialogButtons() & MessageBoxFlags::DIALOGBUTTON_CANCEL) - return MessageBoxFlags::DIALOGBUTTON_CANCEL; - return MessageBoxFlags::DIALOGBUTTON_NONE; + if (GetDialogButtons() & ui::MessageBoxFlags::DIALOGBUTTON_OK) + return ui::MessageBoxFlags::DIALOGBUTTON_OK; + if (GetDialogButtons() & ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) + return ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::MessageBoxFlags::DIALOGBUTTON_NONE; } bool DialogDelegate::IsDialogButtonEnabled( @@ -75,7 +75,7 @@ View* DialogDelegate::GetInitiallyFocusedView() { // Focus the default button if any. const DialogClientView* dcv = GetDialogClientView(); int default_button = GetDefaultDialogButton(); - if (default_button == MessageBoxFlags::DIALOGBUTTON_NONE) + if (default_button == ui::MessageBoxFlags::DIALOGBUTTON_NONE) return NULL; if ((default_button & GetDialogButtons()) == 0) { @@ -84,9 +84,9 @@ View* DialogDelegate::GetInitiallyFocusedView() { return NULL; } - if (default_button & MessageBoxFlags::DIALOGBUTTON_OK) + if (default_button & ui::MessageBoxFlags::DIALOGBUTTON_OK) return dcv->ok_button(); - if (default_button & MessageBoxFlags::DIALOGBUTTON_CANCEL) + if (default_button & ui::MessageBoxFlags::DIALOGBUTTON_CANCEL) return dcv->cancel_button(); return NULL; } diff --git a/views/window/dialog_delegate.h b/views/window/dialog_delegate.h index 79c0e20..7ce10d4 100644 --- a/views/window/dialog_delegate.h +++ b/views/window/dialog_delegate.h @@ -12,8 +12,6 @@ #include "views/widget/widget_delegate.h" #include "views/window/dialog_client_view.h" -using ui::MessageBoxFlags; - namespace views { class View; @@ -129,7 +127,6 @@ class VIEWS_EXPORT DialogDelegateView : public DialogDelegate, DISALLOW_COPY_AND_ASSIGN(DialogDelegateView); }; - } // namespace views #endif // VIEWS_WINDOW_DIALOG_DELEGATE_H_ |