summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_protocols.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/extension_protocols.cc')
-rw-r--r--chrome/browser/extensions/extension_protocols.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index 30f7b37..f281c74 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -99,7 +99,8 @@ bool AllowExtensionResourceLoad(URLRequest* request,
// This is because an extension must run in a single process, and an
// incognito tab prevents that.
if (context->is_off_the_record() &&
- info->resource_type() == ResourceType::MAIN_FRAME) {
+ info->resource_type() == ResourceType::MAIN_FRAME &&
+ !context->ExtensionCanLoadInIncognito(request->url().host())) {
LOG(ERROR) << "Denying load of " << request->url().spec() << " from "
<< "incognito tab.";
return false;