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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2764993002: CSP: group policies in didAddContentSecurityPolicy. (Closed)
Patch Set: CSP send policies in didAddContentSecurityPolicy one by one. Created 3 years, 9 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
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 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1849 matching lines...) Expand 10 before | Expand all | Expand 10 after
1860 1860
1861 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( 1861 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader(
1862 const ParsedFeaturePolicyHeader& parsed_header) { 1862 const ParsedFeaturePolicyHeader& parsed_header) {
1863 frame_tree_node()->SetFeaturePolicyHeader(parsed_header); 1863 frame_tree_node()->SetFeaturePolicyHeader(parsed_header);
1864 ResetFeaturePolicy(); 1864 ResetFeaturePolicy();
1865 feature_policy_->SetHeaderPolicy(parsed_header); 1865 feature_policy_->SetHeaderPolicy(parsed_header);
1866 } 1866 }
1867 1867
1868 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy( 1868 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy(
1869 const ContentSecurityPolicyHeader& header, 1869 const ContentSecurityPolicyHeader& header,
1870 const std::vector<ContentSecurityPolicy>& policies) { 1870 const ContentSecurityPolicy& policy) {
1871 frame_tree_node()->AddContentSecurityPolicy(header); 1871 frame_tree_node()->AddContentSecurityPolicy(header);
1872 for (const ContentSecurityPolicy& policy : policies) 1872 AddContentSecurityPolicy(policy);
1873 AddContentSecurityPolicy(policy);
1874 } 1873 }
1875 1874
1876 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy( 1875 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy(
1877 blink::WebInsecureRequestPolicy policy) { 1876 blink::WebInsecureRequestPolicy policy) {
1878 frame_tree_node()->SetInsecureRequestPolicy(policy); 1877 frame_tree_node()->SetInsecureRequestPolicy(policy);
1879 } 1878 }
1880 1879
1881 void RenderFrameHostImpl::OnUpdateToUniqueOrigin( 1880 void RenderFrameHostImpl::OnUpdateToUniqueOrigin(
1882 bool is_potentially_trustworthy_unique_origin) { 1881 bool is_potentially_trustworthy_unique_origin) {
1883 url::Origin origin; 1882 url::Origin origin;
(...skipping 1676 matching lines...) Expand 10 before | Expand all | Expand 10 after
3560 service_manager::mojom::InterfaceProviderPtr provider; 3559 service_manager::mojom::InterfaceProviderPtr provider;
3561 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); 3560 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
3562 java_interfaces_.reset(new service_manager::InterfaceProvider); 3561 java_interfaces_.reset(new service_manager::InterfaceProvider);
3563 java_interfaces_->Bind(std::move(provider)); 3562 java_interfaces_->Bind(std::move(provider));
3564 } 3563 }
3565 return java_interfaces_.get(); 3564 return java_interfaces_.get();
3566 } 3565 }
3567 #endif 3566 #endif
3568 3567
3569 } // namespace content 3568 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698