| Index: content/browser/frame_host/navigation_handle_impl.h
|
| diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h
|
| index cb339d9b0abce61c4a20f67b3eb0cd711bbcd083..38604692338f2e9caabc1c3447cdc77b1a6fcbed 100644
|
| --- a/content/browser/frame_host/navigation_handle_impl.h
|
| +++ b/content/browser/frame_host/navigation_handle_impl.h
|
| @@ -91,7 +91,8 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
|
| 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);
|
| ~NavigationHandleImpl() override;
|
|
|
| // NavigationHandle implementation:
|
| @@ -148,6 +149,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
|
| const GlobalRequestID& GetGlobalRequestID() override;
|
|
|
| NavigationData* GetNavigationData() override;
|
| + bool should_bypass_main_world_csp() const;
|
|
|
| // The NavigatorDelegate to notify/query for various navigation events.
|
| // Normally this is the WebContents, except if this NavigationHandle was
|
| @@ -351,7 +353,8 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
|
| 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);
|
|
|
| NavigationThrottle::ThrottleCheckResult CheckWillStartRequest();
|
| NavigationThrottle::ThrottleCheckResult CheckWillRedirectRequest();
|
| @@ -495,6 +498,11 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
|
| net::HostPortPair socket_address_;
|
| NavigationType navigation_type_;
|
|
|
| + // Whether or not the navigation has been issued by an isolated world, for
|
| + // instance from a chrome extension. When true, the navigation should not be
|
| + // blocked by the parent frame's CSP.
|
| + bool should_bypass_main_world_csp_;
|
| +
|
| base::WeakPtrFactory<NavigationHandleImpl> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
|
|
|