| 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 3320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3331 return web_bluetooth_service == service.get(); | 3331 return web_bluetooth_service == service.get(); |
| 3332 }); | 3332 }); |
| 3333 DCHECK(it != web_bluetooth_services_.end()); | 3333 DCHECK(it != web_bluetooth_services_.end()); |
| 3334 web_bluetooth_services_.erase(it); | 3334 web_bluetooth_services_.erase(it); |
| 3335 } | 3335 } |
| 3336 | 3336 |
| 3337 void RenderFrameHostImpl::ResetFeaturePolicy() { | 3337 void RenderFrameHostImpl::ResetFeaturePolicy() { |
| 3338 RenderFrameHostImpl* parent_frame_host = GetParent(); | 3338 RenderFrameHostImpl* parent_frame_host = GetParent(); |
| 3339 const FeaturePolicy* parent_policy = | 3339 const FeaturePolicy* parent_policy = |
| 3340 parent_frame_host ? parent_frame_host->get_feature_policy() : nullptr; | 3340 parent_frame_host ? parent_frame_host->get_feature_policy() : nullptr; |
| 3341 // TODO(iclelland): Get the frame owner properties here to reset properly. |
| 3342 ParsedFeaturePolicyHeader container_policy; |
| 3341 feature_policy_ = FeaturePolicy::CreateFromParentPolicy( | 3343 feature_policy_ = FeaturePolicy::CreateFromParentPolicy( |
| 3342 parent_policy, nullptr, last_committed_origin_); | 3344 parent_policy, container_policy, last_committed_origin_); |
| 3343 } | 3345 } |
| 3344 | 3346 |
| 3345 void RenderFrameHostImpl::Create( | 3347 void RenderFrameHostImpl::Create( |
| 3346 const service_manager::Identity& remote_identity, | 3348 const service_manager::Identity& remote_identity, |
| 3347 media::mojom::InterfaceFactoryRequest request) { | 3349 media::mojom::InterfaceFactoryRequest request) { |
| 3348 DCHECK(!media_interface_proxy_); | 3350 DCHECK(!media_interface_proxy_); |
| 3349 media_interface_proxy_.reset(new MediaInterfaceProxy( | 3351 media_interface_proxy_.reset(new MediaInterfaceProxy( |
| 3350 this, std::move(request), | 3352 this, std::move(request), |
| 3351 base::Bind(&RenderFrameHostImpl::OnMediaInterfaceFactoryConnectionError, | 3353 base::Bind(&RenderFrameHostImpl::OnMediaInterfaceFactoryConnectionError, |
| 3352 base::Unretained(this)))); | 3354 base::Unretained(this)))); |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3447 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3449 // There is no pending NavigationEntry in these cases, so pass 0 as the |
| 3448 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3450 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
| 3449 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3451 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
| 3450 return NavigationHandleImpl::Create( | 3452 return NavigationHandleImpl::Create( |
| 3451 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, | 3453 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, |
| 3452 params.was_within_same_page, base::TimeTicks::Now(), | 3454 params.was_within_same_page, base::TimeTicks::Now(), |
| 3453 entry_id_for_data_nav, false); // started_from_context_menu | 3455 entry_id_for_data_nav, false); // started_from_context_menu |
| 3454 } | 3456 } |
| 3455 | 3457 |
| 3456 } // namespace content | 3458 } // namespace content |
| OLD | NEW |