diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 19:22:27 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 19:22:27 +0000 |
| commit | ef062ba24b2916071e286d1abdfbfe3de4d1f52a (patch) | |
| tree | 675703f6b36f24f58c74781724d9bffb518c8430 /ui | |
| parent | 5b2532dde2c9114ceb9f15d756246a1710ccff4e (diff) | |
| download | chromium_src-ef062ba24b2916071e286d1abdfbfe3de4d1f52a.zip chromium_src-ef062ba24b2916071e286d1abdfbfe3de4d1f52a.tar.gz chromium_src-ef062ba24b2916071e286d1abdfbfe3de4d1f52a.tar.bz2 | |
views: Move DialogButton enum into ui/base/ and put it into the ui namespace.
R=sky@chromium.org
Review URL: http://codereview.chromium.org/8334041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/message_box_flags.h | 10 | ||||
| -rw-r--r-- | ui/base/ui_base_types.h | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/ui/base/message_box_flags.h b/ui/base/message_box_flags.h index d3cd569..207a97c 100644 --- a/ui/base/message_box_flags.h +++ b/ui/base/message_box_flags.h @@ -45,16 +45,8 @@ class MessageBoxFlags { static const int kIsJavascriptPrompt = kIsJavascriptConfirm | kFlagHasPromptField; - // Dialog button identifiers used to specify which buttons to show the user. - enum DialogButton { - DIALOGBUTTON_NONE = 0, // No dialog buttons, for WindowType == WINDOW. - DIALOGBUTTON_OK = 1, // Has an OK button. - DIALOGBUTTON_CANCEL = 2, // Has a Cancel button (becomes a Close button if - }; // no OK button). - private: - MessageBoxFlags() {} - DISALLOW_COPY_AND_ASSIGN(MessageBoxFlags); + DISALLOW_IMPLICIT_CONSTRUCTORS(MessageBoxFlags); }; } // namespace ui diff --git a/ui/base/ui_base_types.h b/ui/base/ui_base_types.h index 3d2b927..c4ba28e 100644 --- a/ui/base/ui_base_types.h +++ b/ui/base/ui_base_types.h @@ -21,6 +21,13 @@ enum WindowShowState { SHOW_STATE_END = 6 // The end of show state enum. }; +// Dialog button identifiers used to specify which buttons to show the user. +enum DialogButton { + DIALOG_BUTTON_NONE = 0, + DIALOG_BUTTON_OK = 1, + DIALOG_BUTTON_CANCEL = 2, +}; + } // namespace ui #endif // UI_BASE_UI_BASE_TYPES_H_ |