| 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 819d847e9abfd8fdb2875405a7a87722d0cb5e27..8372a46a37a1bb6eb2a5e1ce7ab6b402887c5fca 100644
|
| --- a/content/browser/frame_host/navigation_handle_impl.h
|
| +++ b/content/browser/frame_host/navigation_handle_impl.h
|
| @@ -91,8 +91,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);
|
| ~NavigationHandleImpl() override;
|
|
|
| // Used to track the state the navigation is currently in.
|
| @@ -360,10 +359,6 @@
|
| base_url_for_data_url_ = url;
|
| }
|
|
|
| - CSPDisposition should_check_main_world_csp() const {
|
| - return should_check_main_world_csp_;
|
| - }
|
| -
|
| private:
|
| friend class NavigationHandleImplTest;
|
|
|
| @@ -374,8 +369,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);
|
|
|
| NavigationThrottle::ThrottleCheckResult CheckWillStartRequest();
|
| NavigationThrottle::ThrottleCheckResult CheckWillRedirectRequest();
|
| @@ -531,11 +525,6 @@
|
| net::HostPortPair socket_address_;
|
| NavigationType navigation_type_;
|
|
|
| - // Whether or not the CSP of the main world should apply. When the navigation
|
| - // is initiated from a content script in an isolated world, the CSP defined
|
| - // in the main world should not apply.
|
| - CSPDisposition should_check_main_world_csp_;
|
| -
|
| base::WeakPtrFactory<NavigationHandleImpl> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
|
|
|