| 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 f2eb0d2481e2d6d671b26d5cd14e38a0dff7b13c..12193432b35388895820f5b31e06271d23a27598 100644
|
| --- a/content/public/common/common_param_traits_macros.h
|
| +++ b/content/public/common/common_param_traits_macros.h
|
| @@ -11,7 +11,6 @@
|
| #include "build/build_config.h"
|
| #include "content/public/common/console_message_level.h"
|
| #include "content/public/common/referrer.h"
|
| -#include "content/public/common/security_style.h"
|
| #include "content/public/common/web_preferences.h"
|
| #include "content/public/common/webplugininfo.h"
|
| #include "ipc/ipc_message_macros.h"
|
| @@ -20,6 +19,7 @@
|
| #include "third_party/WebKit/public/platform/WebPoint.h"
|
| #include "third_party/WebKit/public/platform/WebRect.h"
|
| #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
|
| +#include "third_party/WebKit/public/platform/WebSecurityStyle.h"
|
| #include "third_party/WebKit/public/platform/WebURLRequest.h"
|
| #include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
|
| #include "third_party/WebKit/public/web/WebFrameSerializerCacheControlPolicy.h"
|
| @@ -45,12 +45,11 @@ IPC_ENUM_TRAITS_MAX_VALUE(net::NetworkChangeNotifier::ConnectionType,
|
| net::NetworkChangeNotifier::CONNECTION_LAST)
|
| IPC_ENUM_TRAITS_MAX_VALUE(content::ConsoleMessageLevel,
|
| content::CONSOLE_MESSAGE_LEVEL_LAST)
|
| -IPC_ENUM_TRAITS_MAX_VALUE(content::SecurityStyle,
|
| - content::SECURITY_STYLE_LAST)
|
| IPC_ENUM_TRAITS_MAX_VALUE(blink::WebFrameSerializerCacheControlPolicy,
|
| blink::WebFrameSerializerCacheControlPolicy::Last)
|
| IPC_ENUM_TRAITS_MAX_VALUE(blink::WebReferrerPolicy,
|
| blink::WebReferrerPolicyLast)
|
| +IPC_ENUM_TRAITS_MAX_VALUE(blink::WebSecurityStyle, blink::WebSecurityStyleLast)
|
| IPC_ENUM_TRAITS_MAX_VALUE(blink::mojom::PermissionStatus,
|
| blink::mojom::PermissionStatus::LAST)
|
| IPC_ENUM_TRAITS_MAX_VALUE(content::EditingBehavior,
|
|
|