| 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 1724 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1735 } | 1735 } |
| 1736 | 1736 |
| 1737 std::string old_name = frame_tree_node()->frame_name(); | 1737 std::string old_name = frame_tree_node()->frame_name(); |
| 1738 frame_tree_node()->SetFrameName(name, unique_name); | 1738 frame_tree_node()->SetFrameName(name, unique_name); |
| 1739 if (old_name.empty() && !name.empty()) | 1739 if (old_name.empty() && !name.empty()) |
| 1740 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); | 1740 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); |
| 1741 delegate_->DidChangeName(this, name); | 1741 delegate_->DidChangeName(this, name); |
| 1742 } | 1742 } |
| 1743 | 1743 |
| 1744 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( | 1744 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( |
| 1745 const std::string& header) { | 1745 const std::vector<FeaturePolicyParsedWhitelist>& parsed_whitelists) { |
| 1746 frame_tree_node()->SetFeaturePolicyHeader(header); | 1746 frame_tree_node()->SetFeaturePolicyHeader(parsed_whitelists); |
| 1747 } | 1747 } |
| 1748 | 1748 |
| 1749 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy( | 1749 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy( |
| 1750 const ContentSecurityPolicyHeader& header) { | 1750 const ContentSecurityPolicyHeader& header) { |
| 1751 frame_tree_node()->AddContentSecurityPolicy(header); | 1751 frame_tree_node()->AddContentSecurityPolicy(header); |
| 1752 } | 1752 } |
| 1753 | 1753 |
| 1754 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy( | 1754 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy( |
| 1755 blink::WebInsecureRequestPolicy policy) { | 1755 blink::WebInsecureRequestPolicy policy) { |
| 1756 frame_tree_node()->SetInsecureRequestPolicy(policy); | 1756 frame_tree_node()->SetInsecureRequestPolicy(policy); |
| (...skipping 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3311 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3311 // There is no pending NavigationEntry in these cases, so pass 0 as the |
| 3312 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3312 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
| 3313 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3313 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
| 3314 return NavigationHandleImpl::Create( | 3314 return NavigationHandleImpl::Create( |
| 3315 params.url, frame_tree_node_, is_renderer_initiated, | 3315 params.url, frame_tree_node_, is_renderer_initiated, |
| 3316 params.was_within_same_page, params.is_srcdoc, base::TimeTicks::Now(), | 3316 params.was_within_same_page, params.is_srcdoc, base::TimeTicks::Now(), |
| 3317 entry_id_for_data_nav, false); // started_from_context_menu | 3317 entry_id_for_data_nav, false); // started_from_context_menu |
| 3318 } | 3318 } |
| 3319 | 3319 |
| 3320 } // namespace content | 3320 } // namespace content |
| OLD | NEW |