Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: chrome/app/policy/policy_templates.json

Issue 11078023: Add controlled setting indicators for content settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mark which of the policies considered can be recommended. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/app/policy/policy_templates.json
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index 6160f085daeb3bd0fb96a742886a13bb20e73767..b674ef9085662636d7a61dd410caf99891121f50 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -330,15 +330,11 @@
'caption': '''Enable JavaScript''',
'desc': '''This policy is deprecated, please use DefaultJavaScriptSetting instead.
- Enables JavaScript in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
+ Can be used to disabled JavaScript in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
- If this setting is enabled or not configured, web pages can use JavaScript.
+ If this setting is disabled, web pages cannot use JavaScript and the user cannot change that setting.
- If this setting is disabled, web pages cannot use JavaScript.
-
- If this policy is left not set the default value will be used which is enabled and the user will be able to change it.
-
- If this policy is left not set, this will be enabled but the user will be able to change it.''',
+ If this setting is enabled or not set, web pages can use JavaScript but the user can change that setting.''',
},
{
'name': 'IncognitoEnabled',
« no previous file with comments | « no previous file | chrome/browser/policy/policy_prefs_browsertest.cc » ('j') | chrome/browser/policy/policy_prefs_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698