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

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: Fix problems with early returns. 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
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..ff8c619816f2c5927cd9acbc1797cc816206a61f 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -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"
@@ -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 (url_request_util::ChromeAllowCrossRendererResourceLoad(
+ 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/url_request_util.h » ('j') | chrome/browser/extensions/url_request_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698