| 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_manager.h" | 5 #include "content/browser/frame_host/render_frame_host_manager.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 if (pending_render_frame_host_ && | 528 if (pending_render_frame_host_ && |
| 529 pending_render_frame_host_->GetSiteInstance() != source_site_instance) { | 529 pending_render_frame_host_->GetSiteInstance() != source_site_instance) { |
| 530 pending_render_frame_host_->UpdateOpener(); | 530 pending_render_frame_host_->UpdateOpener(); |
| 531 } | 531 } |
| 532 | 532 |
| 533 if (speculative_render_frame_host_ && | 533 if (speculative_render_frame_host_ && |
| 534 speculative_render_frame_host_->GetSiteInstance() != | 534 speculative_render_frame_host_->GetSiteInstance() != |
| 535 source_site_instance) { | 535 source_site_instance) { |
| 536 speculative_render_frame_host_->UpdateOpener(); | 536 speculative_render_frame_host_->UpdateOpener(); |
| 537 } | 537 } |
| 538 |
| 539 frame_tree_node_->current_frame_host()->delegate()->DidChangeOpener( |
| 540 frame_tree_node_, opener); |
| 538 } | 541 } |
| 539 | 542 |
| 540 void RenderFrameHostManager::CommitPendingFramePolicy() { | 543 void RenderFrameHostManager::CommitPendingFramePolicy() { |
| 541 // Return early if there were no pending updates to sandbox flags or container | 544 // Return early if there were no pending updates to sandbox flags or container |
| 542 // policy. | 545 // policy. |
| 543 if (!frame_tree_node_->CommitPendingFramePolicy()) | 546 if (!frame_tree_node_->CommitPendingFramePolicy()) |
| 544 return; | 547 return; |
| 545 | 548 |
| 546 // Policy updates can only happen when the frame has a parent. | 549 // Policy updates can only happen when the frame has a parent. |
| 547 CHECK(frame_tree_node_->parent()); | 550 CHECK(frame_tree_node_->parent()); |
| (...skipping 2306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2854 delegate_->IsHidden()) { | 2857 delegate_->IsHidden()) { |
| 2855 if (delegate_->IsHidden()) { | 2858 if (delegate_->IsHidden()) { |
| 2856 render_frame_host_->GetView()->Hide(); | 2859 render_frame_host_->GetView()->Hide(); |
| 2857 } else { | 2860 } else { |
| 2858 render_frame_host_->GetView()->Show(); | 2861 render_frame_host_->GetView()->Show(); |
| 2859 } | 2862 } |
| 2860 } | 2863 } |
| 2861 } | 2864 } |
| 2862 | 2865 |
| 2863 } // namespace content | 2866 } // namespace content |
| OLD | NEW |