summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-13 19:01:37 +0000
committerrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-13 19:01:37 +0000
commit9858541b91d0d0af8c8bac564a499135a7c21c87 (patch)
treef2e653e186aa4c30a1e4475f528e5bad5ac4cb38 /extensions
parent488b5a7c935a9a59556280fb934a1bb90bda5d6b (diff)
downloadchromium_src-9858541b91d0d0af8c8bac564a499135a7c21c87.zip
chromium_src-9858541b91d0d0af8c8bac564a499135a7c21c87.tar.gz
chromium_src-9858541b91d0d0af8c8bac564a499135a7c21c87.tar.bz2
Add Active Script permissioning to chrome:flags.
Add the option to force extensions to request permission before running a script (iff they requested all urls) to chrome:flags. BUG=372244 BUG=362353 Review URL: https://codereview.chromium.org/275863004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/switches.cc8
-rw-r--r--extensions/common/switches.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/extensions/common/switches.cc b/extensions/common/switches.cc
index 306f85a..c416ac9 100644
--- a/extensions/common/switches.cc
+++ b/extensions/common/switches.cc
@@ -60,7 +60,15 @@ const char kForceDevModeHighlighting[] = "force-dev-mode-highlighting";
const char kGlobalCommands[] = "global-commands";
// Notify the user and require consent for extensions running scripts.
+// Appending --scripts-require-action=1 has the same effect as
+// --enable-scripts-require-action (see below).
const char kScriptsRequireAction[] = "scripts-require-action";
+// FeatureSwitch and about_flags don't play nice. Feature switch expects either
+// --enable-<feature> or --<feature>=1, but about_flags expects the command
+// line argument to enable it (or a selection). Hack this in, so enabling it
+// in about_flags enables the feature. Appending this flag has the same effect
+// as --scripts-require-action=1.
+const char kEnableScriptsRequireAction[] = "enable-scripts-require-action";
// Makes component extensions appear in chrome://settings/extensions.
const char kShowComponentExtensionOptions[] =
diff --git a/extensions/common/switches.h b/extensions/common/switches.h
index f27d782..2faaad4 100644
--- a/extensions/common/switches.h
+++ b/extensions/common/switches.h
@@ -27,6 +27,7 @@ extern const char kExtensionsOnChromeURLs[];
extern const char kForceDevModeHighlighting[];
extern const char kGlobalCommands[];
extern const char kScriptsRequireAction[];
+extern const char kEnableScriptsRequireAction[];
extern const char kShowComponentExtensionOptions[];
extern const char kWhitelistedExtensionID[];