| 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 3380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3391 }); | 3391 }); |
| 3392 DCHECK(it != web_bluetooth_services_.end()); | 3392 DCHECK(it != web_bluetooth_services_.end()); |
| 3393 web_bluetooth_services_.erase(it); | 3393 web_bluetooth_services_.erase(it); |
| 3394 } | 3394 } |
| 3395 | 3395 |
| 3396 void RenderFrameHostImpl::ResetFeaturePolicy() { | 3396 void RenderFrameHostImpl::ResetFeaturePolicy() { |
| 3397 RenderFrameHostImpl* parent_frame_host = GetParent(); | 3397 RenderFrameHostImpl* parent_frame_host = GetParent(); |
| 3398 const FeaturePolicy* parent_policy = | 3398 const FeaturePolicy* parent_policy = |
| 3399 parent_frame_host ? parent_frame_host->get_feature_policy() : nullptr; | 3399 parent_frame_host ? parent_frame_host->get_feature_policy() : nullptr; |
| 3400 feature_policy_ = FeaturePolicy::CreateFromParentPolicy( | 3400 feature_policy_ = FeaturePolicy::CreateFromParentPolicy( |
| 3401 parent_policy, last_committed_origin_); | 3401 parent_policy, nullptr, last_committed_origin_); |
| 3402 } | 3402 } |
| 3403 | 3403 |
| 3404 void RenderFrameHostImpl::Create( | 3404 void RenderFrameHostImpl::Create( |
| 3405 const service_manager::Identity& remote_identity, | 3405 const service_manager::Identity& remote_identity, |
| 3406 media::mojom::InterfaceFactoryRequest request) { | 3406 media::mojom::InterfaceFactoryRequest request) { |
| 3407 DCHECK(!media_interface_proxy_); | 3407 DCHECK(!media_interface_proxy_); |
| 3408 media_interface_proxy_.reset(new MediaInterfaceProxy( | 3408 media_interface_proxy_.reset(new MediaInterfaceProxy( |
| 3409 this, std::move(request), | 3409 this, std::move(request), |
| 3410 base::Bind(&RenderFrameHostImpl::OnMediaInterfaceFactoryConnectionError, | 3410 base::Bind(&RenderFrameHostImpl::OnMediaInterfaceFactoryConnectionError, |
| 3411 base::Unretained(this)))); | 3411 base::Unretained(this)))); |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3506 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3506 // There is no pending NavigationEntry in these cases, so pass 0 as the |
| 3507 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3507 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
| 3508 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3508 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
| 3509 return NavigationHandleImpl::Create( | 3509 return NavigationHandleImpl::Create( |
| 3510 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, | 3510 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, |
| 3511 params.was_within_same_page, base::TimeTicks::Now(), | 3511 params.was_within_same_page, base::TimeTicks::Now(), |
| 3512 entry_id_for_data_nav, false); // started_from_context_menu | 3512 entry_id_for_data_nav, false); // started_from_context_menu |
| 3513 } | 3513 } |
| 3514 | 3514 |
| 3515 } // namespace content | 3515 } // namespace content |
| OLD | NEW |