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

Unified Diff: chrome/common/extensions/extension.cc

Issue 10826134: Revert 149610 - Extension resources should only load in contexts the extension has permission to ac… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/common/extensions/extension.cc
===================================================================
--- chrome/common/extensions/extension.cc (revision 149757)
+++ chrome/common/extensions/extension.cc (working copy)
@@ -536,28 +536,11 @@
return false;
}
-bool Extension::HasNaClModules() const {
- if (nacl_modules_.size())
- return true;
-
- return false;
-}
-
bool Extension::IsSandboxedPage(const std::string& relative_path) const {
return ResourceMatches(sandboxed_pages_, relative_path);
}
-bool Extension::IsResourceNaClManifest(const std::string& resource) const {
- GURL url = extension_url_.Resolve(resource);
- for (std::vector<NaClModuleInfo>::const_iterator it = nacl_modules_.begin();
- it != nacl_modules_.end(); it++) {
- if (it->url == url)
- return true;
- }
- return false;
-}
-
std::string Extension::GetResourceContentSecurityPolicy(
const std::string& relative_path) const {
return IsSandboxedPage(relative_path) ?
« no previous file with comments | « chrome/common/extensions/extension.h ('k') | chrome/renderer/extensions/extension_resource_request_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698