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

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

Issue 573843002: Allows webview to access extension resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Forgot to add the namespace on chrome_url_request_util.cc Created 6 years, 3 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 | « no previous file | chrome/browser/extensions/chrome_url_request_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 12219a55d58ee119b31a540eb5371b7449ae9a5b..82fdfad4addfe258a8a86bd9c61803cafd0d8be1 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -20,10 +20,10 @@
#include "chrome/browser/extensions/chrome_component_extension_resource_manager.h"
#include "chrome/browser/extensions/chrome_extension_host_delegate.h"
#include "chrome/browser/extensions/chrome_process_manager_delegate.h"
+#include "chrome/browser/extensions/chrome_url_request_util.h"
#include "chrome/browser/extensions/event_router_forwarder.h"
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/extensions/extension_util.h"
-#include "chrome/browser/extensions/url_request_util.h"
#include "chrome/browser/external_protocol/external_protocol_handler.h"
#include "chrome/browser/net/chrome_net_log.h"
#include "chrome/browser/profiles/profile.h"
@@ -37,6 +37,7 @@
#include "extensions/browser/extension_function_registry.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/pref_names.h"
+#include "extensions/browser/url_request_util.h"
#if defined(OS_CHROMEOS)
#include "chromeos/chromeos_switches.h"
@@ -125,7 +126,7 @@ ChromeExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(
const base::FilePath& directory_path,
const std::string& content_security_policy,
bool send_cors_header) {
- return url_request_util::MaybeCreateURLRequestResourceBundleJob(
+ return chrome_url_request_util::MaybeCreateURLRequestResourceBundleJob(
request,
network_delegate,
directory_path,
@@ -138,8 +139,13 @@ bool ChromeExtensionsBrowserClient::AllowCrossRendererResourceLoad(
bool is_incognito,
const Extension* extension,
InfoMap* extension_info_map) {
- return url_request_util::AllowCrossRendererResourceLoad(
- request, is_incognito, extension, extension_info_map);
+ bool allowed = false;
+ if (chrome_url_request_util::AllowCrossRendererResourceLoad(
+ request, is_incognito, extension, extension_info_map, &allowed))
+ return allowed;
+
+ // Couldn't determine if resource is allowed. Block the load.
+ return false;
}
PrefService* ChromeExtensionsBrowserClient::GetPrefServiceForContext(
« no previous file with comments | « no previous file | chrome/browser/extensions/chrome_url_request_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698