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

Side by Side Diff: components/policy/resources/policy_templates.json

Issue 1056003003: Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: extend test Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 { 1 {
2 # policy_templates.json - Metafile for policy templates 2 # policy_templates.json - Metafile for policy templates
3 # 3 #
4 # The content of this file is evaluated as a Python expression. 4 # The content of this file is evaluated as a Python expression.
5 # 5 #
6 # This file is used as input to generate the following policy templates: 6 # This file is used as input to generate the following policy templates:
7 # ADM, ADMX+ADML, MCX/plist and html documentation. 7 # ADM, ADMX+ADML, MCX/plist and html documentation.
8 # 8 #
9 # Policy templates are user interface definitions or documents about the 9 # Policy templates are user interface definitions or documents about the
10 # policies that can be used to configure Chrome. Each policy is a name-value 10 # policies that can be used to configure Chrome. Each policy is a name-value
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 'supported_on': ['chrome.*:25-', 'chrome_os:25-', 'android:30-'], 886 'supported_on': ['chrome.*:25-', 'chrome_os:25-', 'android:30-'],
887 'features': { 887 'features': {
888 'can_be_recommended': False, 888 'can_be_recommended': False,
889 'dynamic_refresh': True, 889 'dynamic_refresh': True,
890 'per_profile': True, 890 'per_profile': True,
891 }, 891 },
892 'deprecated': True, 892 'deprecated': True,
893 'example_value': False, 893 'example_value': False,
894 'id': 162, 894 'id': 162,
895 'caption': '''Force SafeSearch''', 895 'caption': '''Force SafeSearch''',
896 'desc': '''This policy is deprecated, please use ForceGoogleSafeSearch and ForceYouTubeSafetyMode instead. 896 'desc': '''This policy is deprecated, please use ForceGoogleSafeSearch and ForceYouTubeSafetyMode instead. If any of ForceGoogleSafeSearch or ForceYouTube SafetyMode is enabled, then the value of this policy is ignored.
Andrew T Wilson (Slow) 2015/04/16 11:54:37 nit: change this to "The value of this policy will
Marc Treib 2015/04/16 12:00:39 Right, forgot to update this. Good catch, thanks!
897 897
898 Forces queries in Google Web Search to be done with SafeSearch set to acti ve and prevents users from changing this setting. This setting also forces Safet y Mode on YouTube. 898 Forces queries in Google Web Search to be done with SafeSearch set to acti ve and prevents users from changing this setting. This setting also forces Safet y Mode on YouTube.
899 899
900 If you enable this setting, SafeSearch in Google Search and YouTube is alw ays active. 900 If you enable this setting, SafeSearch in Google Search and YouTube is alw ays active.
901 901
902 If you disable this setting or do not set a value, SafeSearch in Google Se arch and YouTube is not enforced.''', 902 If you disable this setting or do not set a value, SafeSearch in Google Se arch and YouTube is not enforced.''',
903 }, 903 },
904 { 904 {
905 'name': 'ForceGoogleSafeSearch', 905 'name': 'ForceGoogleSafeSearch',
906 'type': 'main', 906 'type': 'main',
(...skipping 6546 matching lines...) Expand 10 before | Expand all | Expand 10 after
7453 'desc': '''Text appended in parentheses next to the policies top-level con tainer to indicate that those policies are of the Recommended level''', 7453 'desc': '''Text appended in parentheses next to the policies top-level con tainer to indicate that those policies are of the Recommended level''',
7454 'text': 'Default Settings (users can override)', 7454 'text': 'Default Settings (users can override)',
7455 }, 7455 },
7456 'doc_complex_policies_on_windows': { 7456 'doc_complex_policies_on_windows': {
7457 'desc': '''Text pointing the user to a help article for complex policies o n Windows''', 7457 'desc': '''Text pointing the user to a help article for complex policies o n Windows''',
7458 'text': '''encoded as a JSON string, for details see <ph name="COMPLEX_POL ICIES_URL">http://www.chromium.org/administrators/complex-policies-on-windows<ex >http://www.chromium.org/administrators/complex-policies-on-windows</ex></ph>''' , 7458 'text': '''encoded as a JSON string, for details see <ph name="COMPLEX_POL ICIES_URL">http://www.chromium.org/administrators/complex-policies-on-windows<ex >http://www.chromium.org/administrators/complex-policies-on-windows</ex></ph>''' ,
7459 }, 7459 },
7460 }, 7460 },
7461 'placeholders': [], 7461 'placeholders': [],
7462 } 7462 }
OLDNEW
« chrome/browser/policy/policy_browsertest.cc ('K') | « chrome/common/pref_names.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698