Index: content/common/frame_messages.h |
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h |
index 9035417759bddc8395eb172e1584822ed4c0cca3..2cbb88e3e514ca69d644c694bef610a41aa37e9e 100644 |
--- a/content/common/frame_messages.h |
+++ b/content/common/frame_messages.h |
@@ -19,7 +19,7 @@ |
#include "cc/surfaces/surface_sequence.h" |
#include "content/common/content_export.h" |
#include "content/common/content_param_traits.h" |
-#include "content/common/content_security_policy/content_security_policy.h" |
+#include "content/common/content_security_policy/csp_context.h" |
#include "content/common/content_security_policy_header.h" |
#include "content/common/download/mhtml_save_status.h" |
#include "content/common/frame_message_enums.h" |
@@ -346,6 +346,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::CommonNavigationParams) |
IPC_STRUCT_TRAITS_MEMBER(navigation_start) |
IPC_STRUCT_TRAITS_MEMBER(method) |
IPC_STRUCT_TRAITS_MEMBER(post_data) |
+ IPC_STRUCT_TRAITS_MEMBER(should_bypass_main_world_csp) |
IPC_STRUCT_TRAITS_END() |
IPC_STRUCT_TRAITS_BEGIN(content::BeginNavigationParams) |
@@ -573,6 +574,17 @@ IPC_STRUCT_TRAITS_BEGIN(content::ContentSecurityPolicyHeader) |
IPC_STRUCT_TRAITS_MEMBER(source) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(content::CSPViolationParams) |
+ IPC_STRUCT_TRAITS_MEMBER(directive) |
+ IPC_STRUCT_TRAITS_MEMBER(effective_directive) |
+ IPC_STRUCT_TRAITS_MEMBER(console_message) |
+ IPC_STRUCT_TRAITS_MEMBER(blocked_url) |
+ IPC_STRUCT_TRAITS_MEMBER(report_endpoints) |
+ IPC_STRUCT_TRAITS_MEMBER(header) |
+ IPC_STRUCT_TRAITS_MEMBER(disposition) |
+ IPC_STRUCT_TRAITS_MEMBER(after_redirect) |
+IPC_STRUCT_TRAITS_END() |
+ |
IPC_STRUCT_TRAITS_BEGIN(content::FileChooserFileInfo) |
IPC_STRUCT_TRAITS_MEMBER(file_path) |
IPC_STRUCT_TRAITS_MEMBER(display_name) |
@@ -894,6 +906,12 @@ IPC_MESSAGE_ROUTED4(FrameMsg_FailedNavigation, |
bool, /* stale_copy_in_cache */ |
int /* error_code */) |
+// PlzNavigate |
+// Tells the renderer that a navigation was blocked because a content security |
+// policy was violated. |
+IPC_MESSAGE_ROUTED1(FrameMsg_ReportContentSecurityPolicyViolation, |
+ content::CSPViolationParams /* violation_params */) |
+ |
// Request to enumerate and return links to all savable resources in the frame |
// Note: this covers only the immediate frame / doesn't cover subframes. |
IPC_MESSAGE_ROUTED0(FrameMsg_GetSavableResourceLinks) |