| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index 4cc992cd3c2d59f789b43bf7a76da60f68139950..e33975d857e8f8e1e76f39af03cccf70df9d8a12 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -2539,7 +2539,8 @@ void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) {
|
| data_url, Referrer(), ui::PAGE_TRANSITION_LINK,
|
| FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT, false, false,
|
| base::TimeTicks::Now(), FrameMsg_UILoadMetricsReportType::NO_REPORT,
|
| - GURL(), GURL(), PREVIEWS_OFF, base::TimeTicks::Now(), "GET", nullptr);
|
| + GURL(), GURL(), PREVIEWS_OFF, base::TimeTicks::Now(), "GET", nullptr,
|
| + false /* should_bypass_main_world_csp */);
|
| if (IsBrowserSideNavigationEnabled()) {
|
| CommitNavigation(nullptr, nullptr, common_params, RequestNavigationParams(),
|
| false);
|
| @@ -2775,6 +2776,12 @@ void RenderFrameHostImpl::FailedNavigation(
|
| frame_tree_node_->ResetNavigationRequest(true);
|
| }
|
|
|
| +void RenderFrameHostImpl::ContentSecurityPolicyViolation(
|
| + const CSPViolationParams& violation_params) {
|
| + Send(new FrameMsg_ContentSecurityPolicyViolation(routing_id_,
|
| + violation_params));
|
| +}
|
| +
|
| void RenderFrameHostImpl::SetUpMojoIfNeeded() {
|
| if (interface_registry_.get())
|
| return;
|
| @@ -3459,7 +3466,9 @@ RenderFrameHostImpl::TakeNavigationHandleForCommit(
|
| return NavigationHandleImpl::Create(
|
| params.url, params.redirects, frame_tree_node_, is_renderer_initiated,
|
| params.was_within_same_page, base::TimeTicks::Now(),
|
| - pending_nav_entry_id, false); // started_from_context_menu
|
| + pending_nav_entry_id,
|
| + false, // started_from_context_menu
|
| + false); // should_bypass_main_world_csp
|
| }
|
|
|
| // Determine if the current NavigationHandle can be used.
|
| @@ -3511,7 +3520,9 @@ RenderFrameHostImpl::TakeNavigationHandleForCommit(
|
| return NavigationHandleImpl::Create(
|
| params.url, params.redirects, frame_tree_node_, is_renderer_initiated,
|
| params.was_within_same_page, base::TimeTicks::Now(),
|
| - entry_id_for_data_nav, false); // started_from_context_menu
|
| + entry_id_for_data_nav,
|
| + false, // started_from_context_menu
|
| + false); // should_bypass_main_world_csp
|
| }
|
|
|
| } // namespace content
|
|
|