OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ | 5 #ifndef CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ |
6 #define CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ | 6 #define CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
| 11 #include "third_party/WebKit/public/platform/WebFeaturePolicy.h" |
11 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojo
m.h" | 12 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojo
m.h" |
12 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" | 13 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" |
13 | 14 |
14 namespace content { | 15 namespace content { |
15 | 16 |
16 // Used for IPC transport of WebFrameOwnerProperties. WebFrameOwnerProperties | 17 // Used for IPC transport of WebFrameOwnerProperties. WebFrameOwnerProperties |
17 // can't be used directly as it contains a WebVector which doesn't have | 18 // can't be used directly as it contains a WebVector which doesn't have |
18 // ParamTraits defined. | 19 // ParamTraits defined. |
19 struct CONTENT_EXPORT FrameOwnerProperties { | 20 struct CONTENT_EXPORT FrameOwnerProperties { |
20 FrameOwnerProperties(); | 21 FrameOwnerProperties(); |
(...skipping 13 matching lines...) Expand all Loading... |
34 bool allow_payment_request; | 35 bool allow_payment_request; |
35 | 36 |
36 // An experimental attribute to be used by a parent frame to enforce CSP on a | 37 // An experimental attribute to be used by a parent frame to enforce CSP on a |
37 // subframe. This is different from replicated CSP headers kept in | 38 // subframe. This is different from replicated CSP headers kept in |
38 // FrameReplicationState that keep track of CSP headers currently in effect | 39 // FrameReplicationState that keep track of CSP headers currently in effect |
39 // for a frame. See https://crbug.com/647588 and | 40 // for a frame. See https://crbug.com/647588 and |
40 // https://www.w3.org/TR/csp-embedded-enforcement/#required-csp | 41 // https://www.w3.org/TR/csp-embedded-enforcement/#required-csp |
41 std::string required_csp; | 42 std::string required_csp; |
42 | 43 |
43 std::vector<blink::mojom::PermissionName> delegated_permissions; | 44 std::vector<blink::mojom::PermissionName> delegated_permissions; |
| 45 std::vector<blink::WebFeaturePolicyFeature> allowed_features; |
44 }; | 46 }; |
45 | 47 |
46 } // namespace content | 48 } // namespace content |
47 | 49 |
48 #endif // CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ | 50 #endif // CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ |
OLD | NEW |