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

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

Issue 2655463006: PlzNavigate: Enforce 'frame-src' CSP on the browser. (Closed)
Patch Set: Addressed comments @alexmos. 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 side-by-side diff with in-line comments
Download patch
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 ed4dc615fe406f2b4f6501252e78da729ac9ba42..3bdc4fd36fd2b0c282e6220af03378bd1aaa90c1 100644
--- a/content/browser/frame_host/navigation_handle_impl.h
+++ b/content/browser/frame_host/navigation_handle_impl.h
@@ -92,7 +92,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:
@@ -328,6 +329,10 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
response_headers_ = response_headers;
}
+ bool should_bypass_main_world_csp() const {
+ return should_bypass_main_world_csp_;
+ }
+
private:
friend class NavigationHandleImplTest;
@@ -353,7 +358,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();
@@ -500,6 +506,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);

Powered by Google App Engine
This is Rietveld 408576698