summaryrefslogtreecommitdiffstats
path: root/content/common/drag_traits.h
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 11:11:22 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 11:11:22 +0000
commitdc293a7a4addd6d8b93194588a932b1249739914 (patch)
tree273bbf4d77409f6eb4fdf25681416e9de765bdd8 /content/common/drag_traits.h
parent33539eced948a06b9e8dd7891eadeb515921955a (diff)
downloadchromium_src-dc293a7a4addd6d8b93194588a932b1249739914.zip
chromium_src-dc293a7a4addd6d8b93194588a932b1249739914.tar.gz
chromium_src-dc293a7a4addd6d8b93194588a932b1249739914.tar.bz2
Move WebDropData to content::DropData and split off conversion function.
The WebKit::WebDragData constructor is now provided by DropDataBuilder, which lives in content/renderer/. R=jam@chromium.org TBR=cevans@chromium.org BUG=237267 Review URL: https://chromiumcodereview.appspot.com/18281002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/drag_traits.h')
-rw-r--r--content/common/drag_traits.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/common/drag_traits.h b/content/common/drag_traits.h
index 17306d4..87d52ff 100644
--- a/content/common/drag_traits.h
+++ b/content/common/drag_traits.h
@@ -4,21 +4,21 @@
#include "content/common/drag_event_source_info.h"
#include "content/public/common/common_param_traits.h"
+#include "content/public/common/drop_data.h"
#include "ipc/ipc_message_macros.h"
#include "third_party/WebKit/public/web/WebDragOperation.h"
#include "ui/gfx/point.h"
-#include "webkit/common/webdropdata.h"
#define IPC_MESSAGE_START DragMsgStart
IPC_ENUM_TRAITS(WebKit::WebDragOperation)
-IPC_STRUCT_TRAITS_BEGIN(WebDropData::FileInfo)
+IPC_STRUCT_TRAITS_BEGIN(content::DropData::FileInfo)
IPC_STRUCT_TRAITS_MEMBER(path)
IPC_STRUCT_TRAITS_MEMBER(display_name)
IPC_STRUCT_TRAITS_END()
-IPC_STRUCT_TRAITS_BEGIN(WebDropData)
+IPC_STRUCT_TRAITS_BEGIN(content::DropData)
IPC_STRUCT_TRAITS_MEMBER(url)
IPC_STRUCT_TRAITS_MEMBER(url_title)
IPC_STRUCT_TRAITS_MEMBER(download_metadata)