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

Side by Side Diff: chrome/app/policy/policy_templates.json

Issue 7520023: Converted IncognitoForced boolean policy into IncognitoModeAvailability enum policy. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removed unnecessary comment. Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/bookmarks/bookmark_context_menu_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 264
265 If this setting is enabled or not configured, web pages can use JavaScript . 265 If this setting is enabled or not configured, web pages can use JavaScript .
266 266
267 If this setting is disabled, web pages cannot use JavaScript.''', 267 If this setting is disabled, web pages cannot use JavaScript.''',
268 }, 268 },
269 { 269 {
270 'name': 'IncognitoEnabled', 270 'name': 'IncognitoEnabled',
271 'type': 'main', 271 'type': 'main',
272 'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'], 272 'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
273 'features': {'dynamic_refresh': 1}, 273 'features': {'dynamic_refresh': 1},
274 'deprecated': True,
274 'example_value': False, 275 'example_value': False,
275 'id': 10, 276 'id': 10,
276 'caption': '''Enable Incognito mode''', 277 'caption': '''Enable Incognito mode''',
277 'desc': '''Enables Incognito mode in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. 278 'desc': '''This policy is deprecated. Please, use IncognitoModeAvailabilit y instead.
279 Enables Incognito mode in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex> </ph>.
278 280
279 If this setting is enabled or not configured, users can open web pages in incognito mode. 281 If this setting is enabled or not configured, users can open web pages in incognito mode.
280 282
281 If this setting is disabled, users cannot open web pages in incognito mode .''', 283 If this setting is disabled, users cannot open web pages in incognito mode .''',
282 }, 284 },
283 { 285 {
284 'name': 'IncognitoForced', 286 'name': 'IncognitoModeAvailability',
285 'type': 'main', 287 'type': 'int-enum',
288 'items': [
289 {
290 'name': 'Enabled',
291 'value': 0,
292 'caption': '''Incognito mode available.'''
293 },
294 {
295 'name': 'Disabled',
296 'value': 1,
297 'caption': '''Incognito mode disabled.'''
298 },
299 {
300 'name': 'Forced',
301 'value': 2,
302 'caption': '''Incognito mode forced.'''
303 },
304 ],
286 'supported_on': ['chrome.*:14-', 'chrome_os:0.14-'], 305 'supported_on': ['chrome.*:14-', 'chrome_os:0.14-'],
287 'features': {'dynamic_refresh': 1}, 306 'features': {'dynamic_refresh': 1},
288 'example_value': False, 307 'example_value': 1,
289 'id': 93, 308 'id': 93,
290 'caption': '''Force Incognito mode''', 309 'caption': '''Incognito mode availability.''',
291 'desc': '''Forces every session into Incognito mode in <ph name="PRODUCT_N AME">$1<ex>Google Chrome</ex></ph>. 310 'desc': '''Specifies whether the user may open pages in Incognito mode in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
292 311
293 If this setting is enabled, users can open pages only in incognito mode. 312 If 'Enabled' is selected, pages may be opened in Incognito mode.
294 313
295 If this setting is disabled or not configured, users can use the browser i n normal mode as well.''', 314 If 'Disabled' is selected, pages may not be opened in Incognito mode.
315
316 If 'Forced' is selected, pages may be opened ONLY in Incognito mode.''',
296 }, 317 },
297 { 318 {
298 'name': 'SavingBrowserHistoryDisabled', 319 'name': 'SavingBrowserHistoryDisabled',
299 'type': 'main', 320 'type': 'main',
300 'supported_on': ['chrome.*:8-', 'chrome_os:0.11-'], 321 'supported_on': ['chrome.*:8-', 'chrome_os:0.11-'],
301 'features': {'dynamic_refresh': 1}, 322 'features': {'dynamic_refresh': 1},
302 'example_value': True, 323 'example_value': True,
303 'id': 11, 324 'id': 11,
304 'caption': '''Disable saving browser history''', 325 'caption': '''Disable saving browser history''',
305 'desc': '''Disables saving browser history in <ph name="PRODUCT_NAME">$1<e x>Google Chrome</ex></ph> and prevents users from changing this setting. 326 'desc': '''Disables saving browser history in <ph name="PRODUCT_NAME">$1<e x>Google Chrome</ex></ph> and prevents users from changing this setting.
(...skipping 1439 matching lines...) Expand 10 before | Expand all | Expand 10 after
1745 'desc': '''The name of the feature that indicates for a given policy that changes to it are respected by Chrome without a browser restart''', 1766 'desc': '''The name of the feature that indicates for a given policy that changes to it are respected by Chrome without a browser restart''',
1746 'text': '''Dynamic Policy Refresh''' 1767 'text': '''Dynamic Policy Refresh'''
1747 }, 1768 },
1748 'doc_deprecated': { 1769 'doc_deprecated': {
1749 'desc': '''Text appended in parentheses to the policy name to indicate t h at it has been deprecated''', 1770 'desc': '''Text appended in parentheses to the policy name to indicate t h at it has been deprecated''',
1750 'text': 'deprecated', 1771 'text': 'deprecated',
1751 } 1772 }
1752 }, 1773 },
1753 'placeholders': [], 1774 'placeholders': [],
1754 } 1775 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/bookmarks/bookmark_context_menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698