Index: chrome/browser/extensions/extension_protocols.cc |
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc |
index 53ee2ea0d60e45e7731e0e75b1f67cd2ab12de8d..62ee6a4f8b3ba8bb923e0a33af9ea92877d8bd11 100644 |
--- a/chrome/browser/extensions/extension_protocols.cc |
+++ b/chrome/browser/extensions/extension_protocols.cc |
@@ -24,6 +24,7 @@ |
#include "chrome/common/extensions/extension.h" |
#include "chrome/common/extensions/extension_file_util.h" |
#include "chrome/common/extensions/extension_resource.h" |
+#include "chrome/common/extensions/manifest_web_handler.h" |
#include "chrome/common/url_constants.h" |
#include "content/public/browser/resource_request_info.h" |
#include "extensions/common/constants.h" |
@@ -353,8 +354,10 @@ ExtensionProtocolHandler::MaybeCreateJob( |
content_security_policy = |
extension->GetResourceContentSecurityPolicy(resource_path); |
if ((extension->manifest_version() >= 2 || |
- extension->HasWebAccessibleResources()) && |
- extension->IsResourceWebAccessible(resource_path)) |
+ extensions::WebAccessibleResourcesInfo::HasWebAccessibleResources( |
Yoyo Zhou
2013/01/10 00:37:58
nit: this indent is wrong; it should align with th
Joe Thomas
2013/01/10 20:56:18
Done
|
+ extension)) && |
+ extensions::WebAccessibleResourcesInfo::IsResourceWebAccessible( |
+ resource_path, extension)) |
send_cors_header = true; |
} |