summaryrefslogtreecommitdiffstats
path: root/chrome/app/policy
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-02 18:53:49 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-02 18:53:49 +0000
commit3d54b8c75156ec73caa1407d6e50389d836ac7ef (patch)
treeca00baaf61a424d1730d11a6686d442a32801ba1 /chrome/app/policy
parent973ef7f646b638264aef96e2a0911dc7c4fbba53 (diff)
downloadchromium_src-3d54b8c75156ec73caa1407d6e50389d836ac7ef.zip
chromium_src-3d54b8c75156ec73caa1407d6e50389d836ac7ef.tar.gz
chromium_src-3d54b8c75156ec73caa1407d6e50389d836ac7ef.tar.bz2
Adds the ability for instant to be controlled by group policy.
BUG=64922 TEST=none Review URL: http://codereview.chromium.org/6312070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy')
-rw-r--r--chrome/app/policy/policy_templates.json15
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index f93a4f4..3341040 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -1100,6 +1100,21 @@
If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome OS</ex></ph>.''',
},
+ {
+ 'name': 'InstantEnabled',
+ 'type': 'main',
+ 'supported_on': ['chrome.*:11-'],
+ 'features': {'dynamic_refresh': 1},
+ 'example_value': True,
+ 'caption': '''Enable Instant''',
+ 'desc': '''Enables <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s Instant feature and prevents users from changing this setting.
+
+ If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Instant is enabled.
+
+ If you disable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Instant is disabled.
+
+ If you enable or disable this setting, users cannot change or override this setting.''',
+ },
],
'messages': {
# Messages that are not associated to any policies.