Chromium Code Reviews| 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" |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 27 | 27 |
| 28 bool operator==(const FrameOwnerProperties& other) const; | 28 bool operator==(const FrameOwnerProperties& other) const; |
| 29 bool operator!=(const FrameOwnerProperties& other) const { | 29 bool operator!=(const FrameOwnerProperties& other) const { |
| 30 return !(*this == other); | 30 return !(*this == other); |
| 31 } | 31 } |
| 32 | 32 |
| 33 blink::WebFrameOwnerProperties::ScrollingMode scrolling_mode; | 33 blink::WebFrameOwnerProperties::ScrollingMode scrolling_mode; |
| 34 int margin_width; | 34 int margin_width; |
| 35 int margin_height; | 35 int margin_height; |
| 36 bool allow_fullscreen; | 36 bool allow_fullscreen; |
| 37 // An experimental attribute to be used by a parent frame to enforce CSP on a | |
| 38 // subframe. This is different from replicated CSP headers kept in | |
| 39 // FrameReplicationState that keep track of CSP headers currently in effect | |
| 40 // for a frame. See https://crbug.com/647588 | |
| 41 std::string csp; | |
|
Mike West
2016/10/04 14:55:55
Nit: To clarify further, let's rename this to some
alexmos
2016/10/04 23:50:21
+1, I think this is a good idea.
| |
| 37 std::vector<blink::WebPermissionType> delegated_permissions; | 42 std::vector<blink::WebPermissionType> delegated_permissions; |
| 38 }; | 43 }; |
| 39 | 44 |
| 40 } // namespace content | 45 } // namespace content |
| 41 | 46 |
| 42 #endif // CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ | 47 #endif // CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ |
| OLD | NEW |