diff options
| author | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-04 00:55:32 +0000 |
|---|---|---|
| committer | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-04 00:55:32 +0000 |
| commit | 953620b6b138131552b29163a6a3fa4b3593f083 (patch) | |
| tree | 6837b6816b4401a665266a96786180c9a038e8a8 /chrome/test/data/extensions | |
| parent | 107248107d7b38e9614e99972b3a99385005956e (diff) | |
| download | chromium_src-953620b6b138131552b29163a6a3fa4b3593f083.zip chromium_src-953620b6b138131552b29163a6a3fa4b3593f083.tar.gz chromium_src-953620b6b138131552b29163a6a3fa4b3593f083.tar.bz2 | |
Reland restrict extension features based on the extension type.
The "chrome_url_overrides" manifest key is now accessible by packaged apps.
BUG=101992, 104103
TEST=existing, ManifestTest
Review URL: http://codereview.chromium.org/8654001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data/extensions')
| -rw-r--r-- | chrome/test/data/extensions/manifest_tests/background_permission.json (renamed from chrome/test/data/extensions/manifest_tests/disallow_hybrid_2.json) | 0 | ||||
| -rw-r--r-- | chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json | 17 | ||||
| -rw-r--r-- | chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces.json (renamed from chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_1.json) | 0 | ||||
| -rw-r--r-- | chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_2.json | 10 | ||||
| -rw-r--r-- | chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_3.json | 11 |
5 files changed, 0 insertions, 38 deletions
diff --git a/chrome/test/data/extensions/manifest_tests/disallow_hybrid_2.json b/chrome/test/data/extensions/manifest_tests/background_permission.json index 06be2c3..06be2c3 100644 --- a/chrome/test/data/extensions/manifest_tests/disallow_hybrid_2.json +++ b/chrome/test/data/extensions/manifest_tests/background_permission.json diff --git a/chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json b/chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json deleted file mode 100644 index 3ec899f..0000000 --- a/chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "test", - "version": "1", - "app": { - "urls": [ - "http://www.google.com/mail/", - "http://www.google.com/foobar/" - ], - "launch": { - "web_url": "http://www.google.com/mail/" - } - }, - "permissions": [ - "notifications" - ], - "browser_action": {} -} diff --git a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_1.json b/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces.json index ecc86eb..ecc86eb 100644 --- a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_1.json +++ b/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces.json diff --git a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_2.json b/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_2.json deleted file mode 100644 index 13c798b..0000000 --- a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "foo", - "version": "1", - "browser_action": {}, - "app": { - "launch": { - "local_path": "foo.html" - } - } -} diff --git a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_3.json b/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_3.json deleted file mode 100644 index 2317026..0000000 --- a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_3.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "foo", - "version": "1", - "browser_action": {}, - "page_action": {}, - "app": { - "launch": { - "local_path": "foo.html" - } - } -} |