summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-11 23:25:21 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-11 23:25:21 +0000
commit55a356908083c25a2829db1636564c50c57b430f (patch)
tree1fa448b284205c57f594ca34b175db202af1aec1 /chrome/test
parent6149d3e3ba96cc4aac419777094a1e090b0825e9 (diff)
downloadchromium_src-55a356908083c25a2829db1636564c50c57b430f.zip
chromium_src-55a356908083c25a2829db1636564c50c57b430f.tar.gz
chromium_src-55a356908083c25a2829db1636564c50c57b430f.tar.bz2
Initial work on making extensions work in incognito mode.
This merely adds a way to enable content scripts and browser actions in incognito windows. They still don't work properly because none of the APIs work with incognito tabs. The way to enable an extension is to add an "incognito" bit in the user prefs file. My plan is to add UI for this later. BUG=32365 Review URL: http://codereview.chromium.org/567037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/api_test/browser_action/add_popup/manifest.json3
-rwxr-xr-xchrome/test/data/extensions/api_test/browser_action/basics/manifest.json3
-rwxr-xr-xchrome/test/data/extensions/api_test/browser_action/popup/manifest.json3
-rwxr-xr-xchrome/test/data/extensions/api_test/incognito_no_script/manifest.json2
4 files changed, 8 insertions, 3 deletions
diff --git a/chrome/test/data/extensions/api_test/browser_action/add_popup/manifest.json b/chrome/test/data/extensions/api_test/browser_action/add_popup/manifest.json
index c7ddb6a..697d2ce 100644
--- a/chrome/test/data/extensions/api_test/browser_action/add_popup/manifest.json
+++ b/chrome/test/data/extensions/api_test/browser_action/add_popup/manifest.json
@@ -3,7 +3,8 @@
"version": "1.0",
"background_page": "background.html",
"permissions": [
- "tabs", "http://*/*"
+ "tabs", "http://*/*",
+ "experimental", "incognito"
],
"browser_action": {
"default_title": "Test setPopup()",
diff --git a/chrome/test/data/extensions/api_test/browser_action/basics/manifest.json b/chrome/test/data/extensions/api_test/browser_action/basics/manifest.json
index 9604839..9d9e9c1 100755
--- a/chrome/test/data/extensions/api_test/browser_action/basics/manifest.json
+++ b/chrome/test/data/extensions/api_test/browser_action/basics/manifest.json
@@ -3,7 +3,8 @@
"version": "1.0",
"background_page": "background.html",
"permissions": [
- "tabs", "http://*/*"
+ "tabs", "http://*/*",
+ "experimental", "incognito"
],
"browser_action": {
"default_title": "Make this page red",
diff --git a/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json b/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json
index f353316..fe2ad11 100755
--- a/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json
+++ b/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json
@@ -2,6 +2,9 @@
"name": "Popup tester",
"version": "0.1",
"description": "apitest for popups",
+ "permissions": [
+ "experimental", "incognito"
+ ],
"browser_action": {
"name": "grow",
"icons": ["chromium.png"],
diff --git a/chrome/test/data/extensions/api_test/incognito_no_script/manifest.json b/chrome/test/data/extensions/api_test/incognito_no_script/manifest.json
index 7c6156e..e8f013c 100755
--- a/chrome/test/data/extensions/api_test/incognito_no_script/manifest.json
+++ b/chrome/test/data/extensions/api_test/incognito_no_script/manifest.json
@@ -2,7 +2,7 @@
"name": "incognito no script",
"version": "0.1",
"description": "Checks that content scripts do not inject js into incognito browsers.",
- "permissions": ["http://*/*", "https://*/*"],
+ "permissions": ["http://*/*", "https://*/*", "experimental", "incognito"],
"content_scripts": [
{
"matches": ["http://*/*", "https://*/*"],