| 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 2be0cdb8f3c46e921b5589a7f28bd2ae4ae8f8ed..b25bf823c26b307f2a20e87db1287e94ba57978a 100644
|
| --- a/content/public/common/common_param_traits_macros.h
|
| +++ b/content/public/common/common_param_traits_macros.h
|
| @@ -9,6 +9,7 @@
|
| #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
|
|
|
| #include "build/build_config.h"
|
| +#include "components/permissions/permission_status.mojom.h"
|
| #include "content/public/common/console_message_level.h"
|
| #include "content/public/common/referrer.h"
|
| #include "content/public/common/security_style.h"
|
| @@ -22,7 +23,6 @@
|
| #include "third_party/WebKit/public/platform/WebRect.h"
|
| #include "third_party/WebKit/public/platform/WebReferrerPolicy.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/WebWindowFeatures.h"
|
| #include "ui/accessibility/ax_node_data.h"
|
| #include "ui/accessibility/ax_tree_update.h"
|
| @@ -47,8 +47,8 @@ IPC_ENUM_TRAITS_MAX_VALUE(content::SecurityStyle,
|
| content::SECURITY_STYLE_LAST)
|
| IPC_ENUM_TRAITS_MAX_VALUE(blink::WebReferrerPolicy,
|
| blink::WebReferrerPolicyLast)
|
| -IPC_ENUM_TRAITS_MAX_VALUE(blink::mojom::PermissionStatus,
|
| - blink::mojom::PermissionStatus::LAST)
|
| +IPC_ENUM_TRAITS_MAX_VALUE(permissions::mojom::PermissionStatus,
|
| + permissions::mojom::PermissionStatus::LAST)
|
| IPC_ENUM_TRAITS_MAX_VALUE(content::EditingBehavior,
|
| content::EDITING_BEHAVIOR_LAST)
|
| IPC_ENUM_TRAITS_MAX_VALUE(WindowOpenDisposition,
|
|
|