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 <utility> | 10 #include <utility> |
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
969 bool should_enforce) { | 969 bool should_enforce) { |
970 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) | 970 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) |
971 return; | 971 return; |
972 | 972 |
973 for (const auto& pair : proxy_hosts_) { | 973 for (const auto& pair : proxy_hosts_) { |
974 pair.second->Send(new FrameMsg_EnforceStrictMixedContentChecking( | 974 pair.second->Send(new FrameMsg_EnforceStrictMixedContentChecking( |
975 pair.second->GetRoutingID(), should_enforce)); | 975 pair.second->GetRoutingID(), should_enforce)); |
976 } | 976 } |
977 } | 977 } |
978 | 978 |
979 void RenderFrameHostManager::OnDidUpdateOrigin(const url::Origin& origin) { | 979 void RenderFrameHostManager::OnDidUpdateOrigin( |
| 980 const url::Origin& origin, |
| 981 bool is_potentially_trustworthy_unique_origin) { |
980 for (const auto& pair : proxy_hosts_) { | 982 for (const auto& pair : proxy_hosts_) { |
981 pair.second->Send( | 983 pair.second->Send( |
982 new FrameMsg_DidUpdateOrigin(pair.second->GetRoutingID(), origin)); | 984 new FrameMsg_DidUpdateOrigin(pair.second->GetRoutingID(), origin, |
| 985 is_potentially_trustworthy_unique_origin)); |
983 } | 986 } |
984 } | 987 } |
985 | 988 |
986 RenderFrameHostManager::SiteInstanceDescriptor::SiteInstanceDescriptor( | 989 RenderFrameHostManager::SiteInstanceDescriptor::SiteInstanceDescriptor( |
987 BrowserContext* browser_context, | 990 BrowserContext* browser_context, |
988 GURL dest_url, | 991 GURL dest_url, |
989 bool related_to_current) | 992 bool related_to_current) |
990 : existing_site_instance(nullptr), | 993 : existing_site_instance(nullptr), |
991 new_is_related_to_current(related_to_current) { | 994 new_is_related_to_current(related_to_current) { |
992 new_site_url = SiteInstance::GetSiteForURL(browser_context, dest_url); | 995 new_site_url = SiteInstance::GetSiteForURL(browser_context, dest_url); |
(...skipping 1440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2433 } else if (pending_render_frame_host_) { | 2436 } else if (pending_render_frame_host_) { |
2434 send_msg(pending_render_frame_host_.get(), | 2437 send_msg(pending_render_frame_host_.get(), |
2435 pending_render_frame_host_->GetRoutingID(), msg); | 2438 pending_render_frame_host_->GetRoutingID(), msg); |
2436 } | 2439 } |
2437 | 2440 |
2438 msg->set_routing_id(render_frame_host_->GetRoutingID()); | 2441 msg->set_routing_id(render_frame_host_->GetRoutingID()); |
2439 render_frame_host_->Send(msg); | 2442 render_frame_host_->Send(msg); |
2440 } | 2443 } |
2441 | 2444 |
2442 } // namespace content | 2445 } // namespace content |
OLD | NEW |