Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(318)

Side by Side Diff: content/browser/frame_host/navigator_impl.cc

Issue 2655463006: PlzNavigate: Enforce 'frame-src' CSP on the browser. (Closed)
Patch Set: Add TODO in the FrameLoader. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/navigator_impl.h" 5 #include "content/browser/frame_host/navigator_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 started_from_context_menu = pending_entry->has_started_from_context_menu(); 230 started_from_context_menu = pending_entry->has_started_from_context_menu();
231 } 231 }
232 232
233 std::vector<GURL> validated_redirect_chain = redirect_chain; 233 std::vector<GURL> validated_redirect_chain = redirect_chain;
234 for (size_t i = 0; i < validated_redirect_chain.size(); ++i) 234 for (size_t i = 0; i < validated_redirect_chain.size(); ++i)
235 render_process_host->FilterURL(false, &validated_redirect_chain[i]); 235 render_process_host->FilterURL(false, &validated_redirect_chain[i]);
236 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create( 236 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create(
237 validated_url, validated_redirect_chain, 237 validated_url, validated_redirect_chain,
238 render_frame_host->frame_tree_node(), is_renderer_initiated, 238 render_frame_host->frame_tree_node(), is_renderer_initiated,
239 false, // is_same_page 239 false, // is_same_page
240 navigation_start, pending_nav_entry_id, started_from_context_menu)); 240 navigation_start, pending_nav_entry_id, started_from_context_menu,
241 false)); // should_bypass_main_world_csp
241 } 242 }
242 243
243 void NavigatorImpl::DidFailProvisionalLoadWithError( 244 void NavigatorImpl::DidFailProvisionalLoadWithError(
244 RenderFrameHostImpl* render_frame_host, 245 RenderFrameHostImpl* render_frame_host,
245 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 246 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
246 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec() 247 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec()
247 << ", error_code: " << params.error_code 248 << ", error_code: " << params.error_code
248 << ", error_description: " << params.error_description 249 << ", error_description: " << params.error_description
249 << ", showing_repost_interstitial: " << 250 << ", showing_repost_interstitial: " <<
250 params.showing_repost_interstitial 251 params.showing_repost_interstitial
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after
1325 if (navigation_handle) 1326 if (navigation_handle)
1326 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); 1327 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID());
1327 1328
1328 controller_->SetPendingEntry(std::move(entry)); 1329 controller_->SetPendingEntry(std::move(entry));
1329 if (delegate_) 1330 if (delegate_)
1330 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); 1331 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
1331 } 1332 }
1332 } 1333 }
1333 1334
1334 } // namespace content 1335 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698