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

Unified Diff: content/browser/frame_host/navigation_handle_impl.cc

Issue 2756913002: Revert of PlzNavigate: Enforce 'frame-src' CSP on the browser. (Closed)
Patch Set: Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_handle_impl.cc
diff --git a/content/browser/frame_host/navigation_handle_impl.cc b/content/browser/frame_host/navigation_handle_impl.cc
index c962652f92223f1255fdbc602838e11ff41adb4a..0460226a9263c52dff90a537a210a5d9073aca1a 100644
--- a/content/browser/frame_host/navigation_handle_impl.cc
+++ b/content/browser/frame_host/navigation_handle_impl.cc
@@ -64,12 +64,11 @@
bool is_same_page,
const base::TimeTicks& navigation_start,
int pending_nav_entry_id,
- bool started_from_context_menu,
- CSPDisposition should_check_main_world_csp) {
+ bool started_from_context_menu) {
return std::unique_ptr<NavigationHandleImpl>(new NavigationHandleImpl(
url, redirect_chain, frame_tree_node, is_renderer_initiated, is_same_page,
- navigation_start, pending_nav_entry_id, started_from_context_menu,
- should_check_main_world_csp));
+ navigation_start, pending_nav_entry_id,
+ started_from_context_menu));
}
NavigationHandleImpl::NavigationHandleImpl(
@@ -80,8 +79,7 @@
bool is_same_page,
const base::TimeTicks& navigation_start,
int pending_nav_entry_id,
- bool started_from_context_menu,
- CSPDisposition should_check_main_world_csp)
+ bool started_from_context_menu)
: url_(url),
has_user_gesture_(false),
transition_(ui::PAGE_TRANSITION_LINK),
@@ -112,7 +110,6 @@
reload_type_(ReloadType::NONE),
restore_type_(RestoreType::NONE),
navigation_type_(NAVIGATION_TYPE_UNKNOWN),
- should_check_main_world_csp_(should_check_main_world_csp),
weak_factory_(this) {
DCHECK(!navigation_start.is_null());
if (redirect_chain_.empty())
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.h ('k') | content/browser/frame_host/navigation_handle_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698