summaryrefslogtreecommitdiffstats
path: root/chrome/test/data/extensions/good
diff options
context:
space:
mode:
authormpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-03 19:06:11 +0000
committermpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-03 19:06:11 +0000
commitc533bb2982bb58ca7cd8d586bc0bc35e2e7f08ed (patch)
tree512a532854320474e7b5592da5d6170fbb6078ee /chrome/test/data/extensions/good
parentdf52439b0895260bbbf62c0de16228e8ae5eace7 (diff)
downloadchromium_src-c533bb2982bb58ca7cd8d586bc0bc35e2e7f08ed.zip
chromium_src-c533bb2982bb58ca7cd8d586bc0bc35e2e7f08ed.tar.gz
chromium_src-c533bb2982bb58ca7cd8d586bc0bc35e2e7f08ed.tar.bz2
Change plugin handling in extension from "plugin_dir" to a "plugin" list of
dictionaries, which allows us to specify properties per plugin. This is the first part of allowing extensions to have plugins only accessible by the extension process. BUG=12960 Review URL: http://codereview.chromium.org/114072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data/extensions/good')
-rw-r--r--chrome/test/data/extensions/good/extension2/2/content_plugin.dll0
-rw-r--r--chrome/test/data/extensions/good/extension2/2/extension_plugin.dll0
-rw-r--r--chrome/test/data/extensions/good/extension2/2/manifest.json5
3 files changed, 4 insertions, 1 deletions
diff --git a/chrome/test/data/extensions/good/extension2/2/content_plugin.dll b/chrome/test/data/extensions/good/extension2/2/content_plugin.dll
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/chrome/test/data/extensions/good/extension2/2/content_plugin.dll
diff --git a/chrome/test/data/extensions/good/extension2/2/extension_plugin.dll b/chrome/test/data/extensions/good/extension2/2/extension_plugin.dll
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/chrome/test/data/extensions/good/extension2/2/extension_plugin.dll
diff --git a/chrome/test/data/extensions/good/extension2/2/manifest.json b/chrome/test/data/extensions/good/extension2/2/manifest.json
index 9dbe0d3..35f01c0 100644
--- a/chrome/test/data/extensions/good/extension2/2/manifest.json
+++ b/chrome/test/data/extensions/good/extension2/2/manifest.json
@@ -2,6 +2,9 @@
"id": "10123456789ABCDEF0123456789ABCDEF0123456",
"version": "1.0.0.0",
"name": "My extension 2",
- "plugins_dir": "npapi",
+ "plugins": [
+ { "path": "content_plugin.dll", "public": true },
+ { "path": "extension_plugin.dll" }
+ ],
"background_page": "background.html"
}