summaryrefslogtreecommitdiffstats
path: root/extensions/test
diff options
context:
space:
mode:
authorkundaji <kundaji@chromium.org>2015-09-18 16:19:09 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-18 23:19:46 +0000
commite548e74412d0a18f8829ce60201eb953a700b09b (patch)
tree4ead1264cfb19591b40be5177c35ba7bbb473970 /extensions/test
parent7305eb15590a4a3b363eeed2f1ed1b8638ee37fe (diff)
downloadchromium_src-e548e74412d0a18f8829ce60201eb953a700b09b.zip
chromium_src-e548e74412d0a18f8829ce60201eb953a700b09b.tar.gz
chromium_src-e548e74412d0a18f8829ce60201eb953a700b09b.tar.bz2
Allow extensions to specify that they are not allowed in incognito mode.
Add "not_allowed" as a valid value to the "incognito" field in the manifest. Track incognito behavior using an enum instead of a boolean to distinguish between "split", "spanning", and "not_allowed". Add CanBeIncognitoEnabled method to utils which checks the manifest entry in addition to checking if extension is platform app or component. BUG=455756 Review URL: https://codereview.chromium.org/1351223003 Cr-Commit-Position: refs/heads/master@{#349806}
Diffstat (limited to 'extensions/test')
-rw-r--r--extensions/test/data/manifest_tests/incognito_not_allowed.json5
-rw-r--r--extensions/test/data/manifest_tests/incognito_spanning.json5
-rw-r--r--extensions/test/data/manifest_tests/incognito_split.json5
-rw-r--r--extensions/test/data/manifest_tests/minimal.json4
4 files changed, 19 insertions, 0 deletions
diff --git a/extensions/test/data/manifest_tests/incognito_not_allowed.json b/extensions/test/data/manifest_tests/incognito_not_allowed.json
new file mode 100644
index 0000000..f44d252
--- /dev/null
+++ b/extensions/test/data/manifest_tests/incognito_not_allowed.json
@@ -0,0 +1,5 @@
+{
+ "name": "test",
+ "version": "1",
+ "incognito": "not_allowed"
+}
diff --git a/extensions/test/data/manifest_tests/incognito_spanning.json b/extensions/test/data/manifest_tests/incognito_spanning.json
new file mode 100644
index 0000000..7e54be4
--- /dev/null
+++ b/extensions/test/data/manifest_tests/incognito_spanning.json
@@ -0,0 +1,5 @@
+{
+ "name": "test",
+ "version": "1",
+ "incognito": "spanning"
+}
diff --git a/extensions/test/data/manifest_tests/incognito_split.json b/extensions/test/data/manifest_tests/incognito_split.json
new file mode 100644
index 0000000..5bb8b67
--- /dev/null
+++ b/extensions/test/data/manifest_tests/incognito_split.json
@@ -0,0 +1,5 @@
+{
+ "name": "test",
+ "version": "1",
+ "incognito": "split"
+}
diff --git a/extensions/test/data/manifest_tests/minimal.json b/extensions/test/data/manifest_tests/minimal.json
new file mode 100644
index 0000000..0d9792a
--- /dev/null
+++ b/extensions/test/data/manifest_tests/minimal.json
@@ -0,0 +1,4 @@
+{
+ "name": "test",
+ "version": "1"
+}