Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(334)

Side by Side Diff: content/browser/frame_host/frame_tree_node.h

Issue 2046733003: Replicate WebInsecureRequestPolicy instead of a bool for strict mixed content checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@securitycontext
Patch Set: alexmos@ Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/frame_host/frame_tree_node.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "content/browser/frame_host/frame_tree_node_blame_context.h" 16 #include "content/browser/frame_host/frame_tree_node_blame_context.h"
17 #include "content/browser/frame_host/render_frame_host_impl.h" 17 #include "content/browser/frame_host/render_frame_host_impl.h"
18 #include "content/browser/frame_host/render_frame_host_manager.h" 18 #include "content/browser/frame_host/render_frame_host_manager.h"
19 #include "content/common/content_export.h" 19 #include "content/common/content_export.h"
20 #include "content/common/frame_replication_state.h" 20 #include "content/common/frame_replication_state.h"
21 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h"
21 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" 22 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
22 #include "url/gurl.h" 23 #include "url/gurl.h"
23 #include "url/origin.h" 24 #include "url/origin.h"
24 25
25 namespace content { 26 namespace content {
26 27
27 class FrameTree; 28 class FrameTree;
28 class NavigationRequest; 29 class NavigationRequest;
29 class Navigator; 30 class Navigator;
30 class RenderFrameHostImpl; 31 class RenderFrameHostImpl;
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 void SetFrameName(const std::string& name, const std::string& unique_name); 150 void SetFrameName(const std::string& name, const std::string& unique_name);
150 151
151 // Add CSP header to replication state and notify proxies about the update. 152 // Add CSP header to replication state and notify proxies about the update.
152 void AddContentSecurityPolicy(const ContentSecurityPolicyHeader& header); 153 void AddContentSecurityPolicy(const ContentSecurityPolicyHeader& header);
153 154
154 // Discards previous CSP headers and notifies proxies about the update. 155 // Discards previous CSP headers and notifies proxies about the update.
155 // Typically invoked after committing navigation to a new document (since the 156 // Typically invoked after committing navigation to a new document (since the
156 // new document comes with a fresh set of CSP http headers). 157 // new document comes with a fresh set of CSP http headers).
157 void ResetContentSecurityPolicy(); 158 void ResetContentSecurityPolicy();
158 159
159 // Sets the current enforcement of strict mixed content checking and 160 // Sets the current insecure request policy, and notifies proxies about the
160 // notifies proxies about the update. 161 // update.
161 void SetEnforceStrictMixedContentChecking(bool should_enforce); 162 void SetInsecureRequestPolicy(blink::WebInsecureRequestPolicy policy);
162 163
163 // Returns the currently active sandbox flags for this frame. This includes 164 // Returns the currently active sandbox flags for this frame. This includes
164 // flags inherited from parent frames and the currently active flags from the 165 // flags inherited from parent frames and the currently active flags from the
165 // <iframe> element hosting this frame. This does not include flags that 166 // <iframe> element hosting this frame. This does not include flags that
166 // have been updated in an <iframe> element but have not taken effect yet; 167 // have been updated in an <iframe> element but have not taken effect yet;
167 // use pending_sandbox_flags() for those. 168 // use pending_sandbox_flags() for those.
168 blink::WebSandboxFlags effective_sandbox_flags() const { 169 blink::WebSandboxFlags effective_sandbox_flags() const {
169 return replication_state_.sandbox_flags; 170 return replication_state_.sandbox_flags;
170 } 171 }
171 172
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 // browser process activities to this node (when possible). It is unrelated 371 // browser process activities to this node (when possible). It is unrelated
371 // to the core logic of FrameTreeNode. 372 // to the core logic of FrameTreeNode.
372 FrameTreeNodeBlameContext blame_context_; 373 FrameTreeNodeBlameContext blame_context_;
373 374
374 DISALLOW_COPY_AND_ASSIGN(FrameTreeNode); 375 DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
375 }; 376 };
376 377
377 } // namespace content 378 } // namespace content
378 379
379 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ 380 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
OLDNEW
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/frame_host/frame_tree_node.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698