diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 14:39:52 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 14:39:52 +0000 |
| commit | ab754fed310c4b16a375368f16dd3b14a38ae997 (patch) | |
| tree | 973d6cc49b64f2df0326c811b4c2e55a3a3ffdb5 | |
| parent | b8876f7dc3421a2772934264cdcabc34c5f75503 (diff) | |
| download | chromium_src-ab754fed310c4b16a375368f16dd3b14a38ae997.zip chromium_src-ab754fed310c4b16a375368f16dd3b14a38ae997.tar.gz chromium_src-ab754fed310c4b16a375368f16dd3b14a38ae997.tar.bz2 | |
Add the Click-to-play option to the DefaultPluginSetting policy.
BUG=66884
Review URL: https://chromiumcodereview.appspot.com/10907109
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155389 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index 8dc4fde..aba9eab 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -1651,7 +1651,7 @@ 'type': 'int-enum', 'schema': { 'type': 'integer', - 'enum': [ 1, 2 ], + 'enum': [ 1, 2, 3 ], }, 'items': [ { @@ -1664,6 +1664,11 @@ 'value': 2, 'caption': '''Block all plugins''', }, + { + 'name': 'ClickToPlay', + 'value': 3, + 'caption': '''Click to play''', + }, ], 'supported_on': ['chrome.*:10-', 'chrome_os:0.11-'], 'features': {'dynamic_refresh': True}, @@ -1672,6 +1677,8 @@ 'caption': '''Default plugins setting''', 'desc': '''Allows you to set whether websites are allowed to automatically run plugins. Automatically running plugins can be either allowed for all websites or denied for all websites. + Click to play allows plugins to run but the user must click them to start their execution. + If this policy is left not set, 'AllowPlugins' will be used and the user will be able to change it.''', }, { |