summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/extension.h
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-30 19:42:30 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-30 19:42:30 +0000
commit31622545bd8eaf1b7b9c89d7fc4e4e69ac953c89 (patch)
tree9ad130945f39f147f88a9c4093f7f71b87cfd57c /chrome/common/extensions/extension.h
parent31162edb159e71d87b138deda82763876c021861 (diff)
downloadchromium_src-31622545bd8eaf1b7b9c89d7fc4e4e69ac953c89.zip
chromium_src-31622545bd8eaf1b7b9c89d7fc4e4e69ac953c89.tar.gz
chromium_src-31622545bd8eaf1b7b9c89d7fc4e4e69ac953c89.tar.bz2
Move parsing of NaCl modules out of Extension.
Unify the NaClModuleInfos. BUG=159265 TBR=mirandac@chromium.org Review URL: https://chromiumcodereview.appspot.com/16171011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension.h')
-rw-r--r--chrome/common/extensions/extension.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 47ed70e..2623f18 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -108,12 +108,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
SYNC_TYPE_APP
};
- // An NaCl module included in the extension.
- struct NaClModuleInfo {
- GURL url;
- std::string mime_type;
- };
-
// A base class for parsed manifest data that APIs want to store on
// the extension. Related to base::SupportsUserData, but with an immutable
// thread-safe interface to match Extension.
@@ -314,9 +308,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
bool converted_from_user_script() const {
return converted_from_user_script_;
}
- const std::vector<NaClModuleInfo>& nacl_modules() const {
- return nacl_modules_;
- }
PermissionsData* permissions_data() { return permissions_data_.get(); }
const PermissionsData* permissions_data() const {
return permissions_data_.get();
@@ -409,7 +400,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
bool LoadSharedFeatures(string16* error);
bool LoadDescription(string16* error);
bool LoadManifestVersion(string16* error);
- bool LoadNaClModules(string16* error);
// Returns true if the extension has more than one "UI surface". For example,
// an extension that has a browser action and a page action.
@@ -469,9 +459,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
// different UI if so).
bool converted_from_user_script_;
- // Optional list of NaCl modules and associated properties.
- std::vector<NaClModuleInfo> nacl_modules_;
-
// The public key used to sign the contents of the crx package.
std::string public_key_;