Index: content/public/common/common_param_traits_macros.h |
diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h |
index a11194e97b189d2422e4279d07b4e49365707574..8040cbef268625b54966042a11a443b85a7ff189 100644 |
--- a/content/public/common/common_param_traits_macros.h |
+++ b/content/public/common/common_param_traits_macros.h |
@@ -15,6 +15,7 @@ |
#include "content/public/common/ssl_status.h" |
#include "content/public/common/webplugininfo.h" |
#include "ipc/ipc_message_macros.h" |
+#include "content/public/common/webpreferences.h" |
#include "net/base/request_priority.h" |
#include "third_party/WebKit/public/platform/WebPoint.h" |
#include "third_party/WebKit/public/platform/WebRect.h" |
@@ -22,7 +23,6 @@ |
#include "third_party/WebKit/public/platform/WebURLRequest.h" |
#include "third_party/WebKit/public/web/WebWindowFeatures.h" |
#include "ui/base/window_open_disposition.h" |
-#include "webkit/common/webpreferences.h" |
#undef IPC_MESSAGE_EXPORT |
#define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
@@ -32,7 +32,7 @@ IPC_ENUM_TRAITS(content::PageTransition) |
IPC_ENUM_TRAITS(content::SecurityStyle) |
IPC_ENUM_TRAITS(blink::WebReferrerPolicy) |
IPC_ENUM_TRAITS(WindowOpenDisposition) |
-IPC_ENUM_TRAITS(webkit_glue::EditingBehavior) |
+IPC_ENUM_TRAITS(content::EditingBehavior) |
IPC_ENUM_TRAITS_MAX_VALUE(net::RequestPriority, net::MAXIMUM_PRIORITY) |
IPC_STRUCT_TRAITS_BEGIN(blink::WebPoint) |