| 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 1752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1763 } | 1763 } |
| 1764 | 1764 |
| 1765 std::string old_name = frame_tree_node()->frame_name(); | 1765 std::string old_name = frame_tree_node()->frame_name(); |
| 1766 frame_tree_node()->SetFrameName(name, unique_name); | 1766 frame_tree_node()->SetFrameName(name, unique_name); |
| 1767 if (old_name.empty() && !name.empty()) | 1767 if (old_name.empty() && !name.empty()) |
| 1768 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); | 1768 frame_tree_node_->render_manager()->CreateProxiesForNewNamedFrame(); |
| 1769 delegate_->DidChangeName(this, name); | 1769 delegate_->DidChangeName(this, name); |
| 1770 } | 1770 } |
| 1771 | 1771 |
| 1772 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( | 1772 void RenderFrameHostImpl::OnDidSetFeaturePolicyHeader( |
| 1773 const ParsedFeaturePolicy& parsed_header) { | 1773 const FeaturePolicyHeader& parsed_header) { |
| 1774 frame_tree_node()->SetFeaturePolicyHeader(parsed_header); | 1774 frame_tree_node()->SetFeaturePolicyHeader(parsed_header); |
| 1775 } | 1775 } |
| 1776 | 1776 |
| 1777 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy( | 1777 void RenderFrameHostImpl::OnDidAddContentSecurityPolicy( |
| 1778 const ContentSecurityPolicyHeader& header) { | 1778 const ContentSecurityPolicyHeader& header) { |
| 1779 frame_tree_node()->AddContentSecurityPolicy(header); | 1779 frame_tree_node()->AddContentSecurityPolicy(header); |
| 1780 } | 1780 } |
| 1781 | 1781 |
| 1782 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy( | 1782 void RenderFrameHostImpl::OnEnforceInsecureRequestPolicy( |
| 1783 blink::WebInsecureRequestPolicy policy) { | 1783 blink::WebInsecureRequestPolicy policy) { |
| (...skipping 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3395 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3395 // There is no pending NavigationEntry in these cases, so pass 0 as the |
| 3396 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3396 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
| 3397 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3397 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
| 3398 return NavigationHandleImpl::Create( | 3398 return NavigationHandleImpl::Create( |
| 3399 params.url, frame_tree_node_, is_renderer_initiated, | 3399 params.url, frame_tree_node_, is_renderer_initiated, |
| 3400 params.was_within_same_page, base::TimeTicks::Now(), | 3400 params.was_within_same_page, base::TimeTicks::Now(), |
| 3401 entry_id_for_data_nav, false); // started_from_context_menu | 3401 entry_id_for_data_nav, false); // started_from_context_menu |
| 3402 } | 3402 } |
| 3403 | 3403 |
| 3404 } // namespace content | 3404 } // namespace content |
| OLD | NEW |