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

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

Issue 11821009: move 'web_accessible_resources' parsing out of Extension class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@url_parse
Patch Set: patch rebased Created 7 years, 11 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/web_accessible_resources_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..c26d7c0f1382c0493ba0509a3f4f6a63cd156763 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/web_accessible_resources_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(
+ extension)) &&
+ extensions::WebAccessibleResourcesInfo::IsResourceWebAccessible(
+ extension, resource_path))
send_cors_header = true;
}
« no previous file with comments | « no previous file | chrome/browser/extensions/web_accessible_resources_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698