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

Unified Diff: extensions/browser/url_request_util.cc

Issue 2432153003: Make sure the default CSP is used for <webview> with PlzNavigate. (Closed)
Patch Set: add comment Created 4 years, 2 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
« no previous file with comments | « extensions/browser/url_request_util.h ('k') | extensions/shell/browser/shell_network_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/url_request_util.cc
diff --git a/extensions/browser/url_request_util.cc b/extensions/browser/url_request_util.cc
index 126f69422e2c25e90c1ee590ce7fadb9f9afb7d4..28d863389078857b11a65b32410543a20e7d433a 100644
--- a/extensions/browser/url_request_util.cc
+++ b/extensions/browser/url_request_util.cc
@@ -8,6 +8,8 @@
#include "content/public/browser/resource_request_info.h"
#include "content/public/common/browser_side_navigation_policy.h"
+#include "extensions/browser/extension_navigation_ui_data.h"
+#include "extensions/browser/extensions_browser_client.h"
#include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
#include "extensions/browser/info_map.h"
#include "extensions/common/extension.h"
@@ -126,13 +128,20 @@ bool AllowCrossRendererResourceLoad(net::URLRequest* request,
return false;
}
-bool IsWebViewRequest(const net::URLRequest* request) {
+bool IsWebViewRequest(net::URLRequest* request) {
const content::ResourceRequestInfo* info =
content::ResourceRequestInfo::ForRequest(request);
// |info| can be NULL sometimes: http://crbug.com/370070.
if (!info)
return false;
- return WebViewRendererState::GetInstance()->IsGuest(info->GetChildID());
+ if (WebViewRendererState::GetInstance()->IsGuest(info->GetChildID()))
+ return true;
+
+ // GetChildId() is -1 with PlzNavigate for navigation requests, so also try
+ // the ExtensionNavigationUIData data.
+ ExtensionNavigationUIData* data =
+ ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
+ return data && data->is_web_view();
}
bool AllowCrossRendererResourceLoadHelper(bool is_guest,
« no previous file with comments | « extensions/browser/url_request_util.h ('k') | extensions/shell/browser/shell_network_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698