diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 20:23:07 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 20:23:07 +0000 |
| commit | 8e82dd864fd63dd9729f8d75baf69ec9ffb8a8c9 (patch) | |
| tree | b9af8d9f7104834010680e4b09b0a3a6f675c47a | |
| parent | c0c041795fc2cd000f08dccc397812a293708c08 (diff) | |
| download | chromium_src-8e82dd864fd63dd9729f8d75baf69ec9ffb8a8c9.zip chromium_src-8e82dd864fd63dd9729f8d75baf69ec9ffb8a8c9.tar.gz chromium_src-8e82dd864fd63dd9729f8d75baf69ec9ffb8a8c9.tar.bz2 | |
Use validating IPC enum macros in drag_traits.h
This is part of a long-running background task to remove the remaining
uses of the unchecked IPC_ENUM_TRAITS() macro.
BUG=246708
Review URL: https://codereview.chromium.org/149443009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249754 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/common/drag_traits.h | 6 | ||||
| -rw-r--r-- | ui/base/dragdrop/drag_drop_types.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/content/common/drag_traits.h b/content/common/drag_traits.h index e462680..fb3eef1 100644 --- a/content/common/drag_traits.h +++ b/content/common/drag_traits.h @@ -11,7 +11,9 @@ #define IPC_MESSAGE_START DragMsgStart -IPC_ENUM_TRAITS(blink::WebDragOperation) +IPC_ENUM_TRAITS(blink::WebDragOperation) // Bitmask. +IPC_ENUM_TRAITS_MAX_VALUE(ui::DragDropTypes::DragEventSource, + ui::DragDropTypes::DRAG_EVENT_SOURCE_LAST) IPC_STRUCT_TRAITS_BEGIN(content::DropData::FileInfo) IPC_STRUCT_TRAITS_MEMBER(path) @@ -33,8 +35,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::DropData) IPC_STRUCT_TRAITS_MEMBER(custom_data) IPC_STRUCT_TRAITS_END() -IPC_ENUM_TRAITS(ui::DragDropTypes::DragEventSource) - IPC_STRUCT_TRAITS_BEGIN(content::DragEventSourceInfo) IPC_STRUCT_TRAITS_MEMBER(event_location) IPC_STRUCT_TRAITS_MEMBER(event_source) diff --git a/ui/base/dragdrop/drag_drop_types.h b/ui/base/dragdrop/drag_drop_types.h index b626b5a..afa8f9e 100644 --- a/ui/base/dragdrop/drag_drop_types.h +++ b/ui/base/dragdrop/drag_drop_types.h @@ -22,6 +22,7 @@ class UI_BASE_EXPORT DragDropTypes { enum DragEventSource { DRAG_EVENT_SOURCE_MOUSE, DRAG_EVENT_SOURCE_TOUCH, + DRAG_EVENT_SOURCE_LAST = DRAG_EVENT_SOURCE_TOUCH }; #if defined(OS_WIN) |