| 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 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 905 } | 905 } |
| 906 | 906 |
| 907 void RenderFrameHostManager::OnDidUpdateName(const std::string& name, | 907 void RenderFrameHostManager::OnDidUpdateName(const std::string& name, |
| 908 const std::string& unique_name) { | 908 const std::string& unique_name) { |
| 909 for (const auto& pair : proxy_hosts_) { | 909 for (const auto& pair : proxy_hosts_) { |
| 910 pair.second->Send(new FrameMsg_DidUpdateName(pair.second->GetRoutingID(), | 910 pair.second->Send(new FrameMsg_DidUpdateName(pair.second->GetRoutingID(), |
| 911 name, unique_name)); | 911 name, unique_name)); |
| 912 } | 912 } |
| 913 } | 913 } |
| 914 | 914 |
| 915 void RenderFrameHostManager::OnDidAddContentSecurityPolicy( | 915 void RenderFrameHostManager::OnDidAddContentSecurityPolicies( |
| 916 const ContentSecurityPolicyHeader& header) { | 916 const std::vector<ContentSecurityPolicyHeader>& headers) { |
| 917 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) | 917 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) |
| 918 return; | 918 return; |
| 919 | 919 |
| 920 for (const auto& pair : proxy_hosts_) { | 920 for (const auto& pair : proxy_hosts_) { |
| 921 pair.second->Send(new FrameMsg_AddContentSecurityPolicy( | 921 pair.second->Send(new FrameMsg_AddContentSecurityPolicies( |
| 922 pair.second->GetRoutingID(), header)); | 922 pair.second->GetRoutingID(), headers)); |
| 923 } | 923 } |
| 924 } | 924 } |
| 925 | 925 |
| 926 void RenderFrameHostManager::OnDidResetContentSecurityPolicy() { | 926 void RenderFrameHostManager::OnDidResetContentSecurityPolicy() { |
| 927 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) | 927 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) |
| 928 return; | 928 return; |
| 929 | 929 |
| 930 for (const auto& pair : proxy_hosts_) { | 930 for (const auto& pair : proxy_hosts_) { |
| 931 pair.second->Send( | 931 pair.second->Send( |
| 932 new FrameMsg_ResetContentSecurityPolicy(pair.second->GetRoutingID())); | 932 new FrameMsg_ResetContentSecurityPolicy(pair.second->GetRoutingID())); |
| (...skipping 1869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2802 delegate_->IsHidden()) { | 2802 delegate_->IsHidden()) { |
| 2803 if (delegate_->IsHidden()) { | 2803 if (delegate_->IsHidden()) { |
| 2804 render_frame_host_->GetView()->Hide(); | 2804 render_frame_host_->GetView()->Hide(); |
| 2805 } else { | 2805 } else { |
| 2806 render_frame_host_->GetView()->Show(); | 2806 render_frame_host_->GetView()->Show(); |
| 2807 } | 2807 } |
| 2808 } | 2808 } |
| 2809 } | 2809 } |
| 2810 | 2810 |
| 2811 } // namespace content | 2811 } // namespace content |
| OLD | NEW |