chrome/browser/extensions/chrome_extensions_browser_client.cc - Issue 237793003: Use default CSP for resource loading in webview (instead of platform app's CSP)

Unified Diff: chrome/browser/extensions/chrome_extensions_browser_client.cc

Issue 237793003: Use default CSP for resource loading in webview (instead of platform app's CSP) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add test Created 6 years, 8 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

« apps/shell/browser/shell_extensions_browser_client.h ('K') | « chrome/browser/extensions/chrome_extensions_browser_client.h ('k') | chrome/test/data/extensions/platform_apps/web_view/shim/guest.html » ('j') | extensions/browser/extensions_browser_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/chrome_extensions_browser_client.cc

diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc

index 2fe1e3580ad31e14ab30c3874cf26f006e5be2ec..2a40d9b7893defb177ea0d235b7c16a8fa94869d 100644

--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc

+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc

@@ -15,6 +15,7 @@

#include "chrome/browser/extensions/api/web_request/web_request_api.h"

#include "chrome/browser/extensions/chrome_app_sorting.h"

#include "chrome/browser/extensions/chrome_extension_host_delegate.h"

+#include "chrome/browser/extensions/extension_renderer_state.h"

#include "chrome/browser/extensions/extension_system_factory.h"

#include "chrome/browser/extensions/extension_util.h"

#include "chrome/browser/extensions/url_request_util.h"

@@ -27,6 +28,7 @@

#include "chrome/common/extensions/api/generated_api.h"

#include "chrome/common/extensions/features/feature_channel.h"

#include "chrome/common/pref_names.h"

+#include "content/public/browser/resource_request_info.h"

#include "extensions/browser/extension_function_registry.h"

#include "extensions/browser/extension_prefs.h"

#include "extensions/browser/pref_names.h"

@@ -113,6 +115,17 @@ bool ChromeExtensionsBrowserClient::CanExtensionCrossIncognito(

|| util::CanCrossIncognito(extension, context);

}

+bool ChromeExtensionsBrowserClient::IsWebViewRequest(

+ net::URLRequest* request) const {

+ const content::ResourceRequestInfo* info =

James Cook 2014/04/15 17:21:21 I would implement this as a utility function in ur

Yoyo Zhou 2014/04/15 21:40:06 +1

lazyboy 2014/04/15 22:17:03 Done.

+ content::ResourceRequestInfo::ForRequest(request);

+ ExtensionRendererState* renderer_state =

+ ExtensionRendererState::GetInstance();

+ ExtensionRendererState::WebViewInfo webview_info;

+ return renderer_state->GetWebViewInfo(

+ info->GetChildID(), info->GetRouteID(), &webview_info);

net::URLRequestJob*

ChromeExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(

net::URLRequest* request,