OLD | NEW |
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 1985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1996 | 1996 |
1997 std::string old_name = frame_tree_node()->frame_name(); | 1997 std::string old_name = frame_tree_node()->frame_name(); |
1998 frame_tree_node()->SetFrameName(name, unique_name); | 1998 frame_tree_node()->SetFrameName(name, unique_name); |
1999 if (old_name.empty() && !name.empty()) | 1999 if (old_name.empty() && !name.empty()) |
2000 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); | 2000 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); |
2001 delegate_->DidChangeName(this, name); | 2001 delegate_->DidChangeName(this, name); |
2002 } | 2002 } |
2003 | 2003 |
2004 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( | 2004 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( |
2005 const ParsedFeaturePolicyHeader& parsed_header) { | 2005 const ParsedFeaturePolicyHeader& parsed_header) { |
| 2006 DCHECK(!feature_policy_->HasSetHeaderPolicy()); |
2006 frame_tree_node()->SetFeaturePolicyHeader(parsed_header); | 2007 frame_tree_node()->SetFeaturePolicyHeader(parsed_header); |
2007 ResetFeaturePolicy(); | 2008 ResetFeaturePolicy(); |
2008 feature_policy_->SetHeaderPolicy(parsed_header); | 2009 feature_policy_->SetHeaderPolicy(parsed_header); |
2009 } | 2010 } |
2010 | 2011 |
2011 void RenderFrameHostImpl::OnDidAddContentSecurityPolicies( | 2012 void RenderFrameHostImpl::OnDidAddContentSecurityPolicies( |
2012 const std::vector<ContentSecurityPolicy>& policies) { | 2013 const std::vector<ContentSecurityPolicy>& policies) { |
2013 TRACE_EVENT1("navigation", | 2014 TRACE_EVENT1("navigation", |
2014 "RenderFrameHostImpl::OnDidAddContentSecurityPolicies", | 2015 "RenderFrameHostImpl::OnDidAddContentSecurityPolicies", |
2015 "frame_tree_node", frame_tree_node_->frame_tree_node_id()); | 2016 "frame_tree_node", frame_tree_node_->frame_tree_node_id()); |
(...skipping 1918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3934 } | 3935 } |
3935 | 3936 |
3936 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( | 3937 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( |
3937 const std::string& interface_name, | 3938 const std::string& interface_name, |
3938 mojo::ScopedMessagePipeHandle pipe) { | 3939 mojo::ScopedMessagePipeHandle pipe) { |
3939 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); | 3940 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); |
3940 } | 3941 } |
3941 #endif | 3942 #endif |
3942 | 3943 |
3943 } // namespace content | 3944 } // namespace content |
OLD | NEW |