Index: chrome/renderer/extensions/resource_request_policy.cc |
diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc |
index 53ddcdd5c28ca7a9c6bae37a58097a57738b3bfa..8561227c27b4528af8bae5c1aab7e5c3ce4aa9eb 100644 |
--- a/chrome/renderer/extensions/resource_request_policy.cc |
+++ b/chrome/renderer/extensions/resource_request_policy.cc |
@@ -11,6 +11,7 @@ |
#include "chrome/common/extensions/extension.h" |
#include "chrome/common/extensions/extension_set.h" |
#include "chrome/common/extensions/manifest_url_handler.h" |
+#include "chrome/common/extensions/manifest_web_handler.h" |
#include "chrome/common/url_constants.h" |
#include "content/public/common/page_transition_types.h" |
#include "extensions/common/constants.h" |
@@ -53,7 +54,8 @@ bool ResourceRequestPolicy::CanRequestResource( |
// Disallow loading of extension resources which are not explicitely listed |
Yoyo Zhou
2013/01/10 00:37:58
nit: explicitely->explicitly
Joe Thomas
2013/01/10 20:56:18
Done.
|
// as web accessible if the manifest version is 2 or greater. |
- if (!extension->IsResourceWebAccessible(resource_url.path()) && |
+ if (!WebAccessibleResourcesInfo::IsResourceWebAccessible( |
+ resource_url.path(), extension) && |
!CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kDisableExtensionsResourceWhitelist)) { |
GURL frame_url = frame->document().url(); |