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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 1751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1762 } | 1762 } |
1763 | 1763 |
1764 std::string old_name = frame_tree_node()->frame_name(); | 1764 std::string old_name = frame_tree_node()->frame_name(); |
1765 frame_tree_node()->SetFrameName(name, unique_name); | 1765 frame_tree_node()->SetFrameName(name, unique_name); |
1766 if (old_name.empty() && !name.empty()) | 1766 if (old_name.empty() && !name.empty()) |
1767 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); | 1767 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); |
1768 delegate_->DidChangeName(this, name); | 1768 delegate_->DidChangeName(this, name); |
1769 } | 1769 } |
1770 | 1770 |
1771 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( | 1771 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( |
1772 const std::string& header) { | 1772 const std::vector<FeaturePolicyParsedWhitelist>& parsed_header) { |
alexmos
2016/12/01 02:04:19
nit: I'm curious if we could make the type a bit m
raymes
2016/12/01 03:03:09
In blink I was trying to distinguish it from the F
alexmos
2016/12/01 22:27:54
Acknowledged.
| |
1773 frame_tree_node()->SetFeaturePolicyHeader(header); | 1773 frame_tree_node()->SetFeaturePolicyHeader(parsed_header); |
1774 } | 1774 } |
1775 | 1775 |
1776 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy( | 1776 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy( |
1777 const ContentSecurityPolicyHeader& header) { | 1777 const ContentSecurityPolicyHeader& header) { |
1778 frame_tree_node()->AddContentSecurityPolicy(header); | 1778 frame_tree_node()->AddContentSecurityPolicy(header); |
1779 } | 1779 } |
1780 | 1780 |
1781 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy( | 1781 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy( |
1782 blink::WebInsecureRequestPolicy policy) { | 1782 blink::WebInsecureRequestPolicy policy) { |
1783 frame_tree_node()->SetInsecureRequestPolicy(policy); | 1783 frame_tree_node()->SetInsecureRequestPolicy(policy); |
(...skipping 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3338 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3338 // There is no pending NavigationEntry in these cases, so pass 0 as the |
3339 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3339 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
3340 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3340 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
3341 return NavigationHandleImpl::Create( | 3341 return NavigationHandleImpl::Create( |
3342 params.url, frame_tree_node_, is_renderer_initiated, | 3342 params.url, frame_tree_node_, is_renderer_initiated, |
3343 params.was_within_same_page, params.is_srcdoc, base::TimeTicks::Now(), | 3343 params.was_within_same_page, params.is_srcdoc, base::TimeTicks::Now(), |
3344 entry_id_for_data_nav, false); // started_from_context_menu | 3344 entry_id_for_data_nav, false); // started_from_context_menu |
3345 } | 3345 } |
3346 | 3346 |
3347 } // namespace content | 3347 } // namespace content |
OLD | NEW |