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 9195f11849db28291f8aab6375626bda9ecf0197..7609374b641605ce1dc0313dc564561b658cdeee 100644 |
--- a/content/browser/frame_host/navigation_handle_impl.cc |
+++ b/content/browser/frame_host/navigation_handle_impl.cc |
@@ -65,11 +65,12 @@ std::unique_ptr<NavigationHandleImpl> NavigationHandleImpl::Create( |
bool is_same_page, |
const base::TimeTicks& navigation_start, |
int pending_nav_entry_id, |
- bool started_from_context_menu) { |
+ bool started_from_context_menu, |
+ bool should_bypass_main_world_csp) { |
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)); |
+ navigation_start, pending_nav_entry_id, started_from_context_menu, |
+ should_bypass_main_world_csp)); |
} |
NavigationHandleImpl::NavigationHandleImpl( |
@@ -80,7 +81,8 @@ NavigationHandleImpl::NavigationHandleImpl( |
bool is_same_page, |
const base::TimeTicks& navigation_start, |
int pending_nav_entry_id, |
- bool started_from_context_menu) |
+ bool started_from_context_menu, |
+ bool should_bypass_main_world_csp) |
: url_(url), |
has_user_gesture_(false), |
transition_(ui::PAGE_TRANSITION_LINK), |
@@ -110,6 +112,7 @@ NavigationHandleImpl::NavigationHandleImpl( |
reload_type_(ReloadType::NONE), |
restore_type_(RestoreType::NONE), |
navigation_type_(NAVIGATION_TYPE_UNKNOWN), |
+ should_bypass_main_world_csp_(should_bypass_main_world_csp), |
weak_factory_(this) { |
DCHECK(!navigation_start.is_null()); |
if (redirect_chain_.empty()) |
@@ -682,9 +685,9 @@ NavigationHandleImpl::CheckWillStartRequest() { |
case NavigationThrottle::PROCEED: |
continue; |
+ case NavigationThrottle::BLOCK_REQUEST: |
case NavigationThrottle::CANCEL: |
case NavigationThrottle::CANCEL_AND_IGNORE: |
- case NavigationThrottle::BLOCK_REQUEST: |
state_ = CANCELING; |
return result; |
@@ -714,6 +717,7 @@ NavigationHandleImpl::CheckWillRedirectRequest() { |
case NavigationThrottle::PROCEED: |
continue; |
+ case NavigationThrottle::BLOCK_REQUEST: |
case NavigationThrottle::CANCEL: |
case NavigationThrottle::CANCEL_AND_IGNORE: |
state_ = CANCELING; |
@@ -724,7 +728,6 @@ NavigationHandleImpl::CheckWillRedirectRequest() { |
next_index_ = i + 1; |
return result; |
- case NavigationThrottle::BLOCK_REQUEST: |
case NavigationThrottle::BLOCK_RESPONSE: |
NOTREACHED(); |
} |