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

Side by Side Diff: chrome/test/data/policy/policy_test_cases.json

Issue 11189060: Add controlled setting indicator for proxy configuration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-add accidentally deleted blank line. 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/options/core_options_handler.cc ('k') | no next file » | 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 "-- Template --": { 2 "-- Template --": {
3 "intro": "Top-level entries map a policy name to its test parameters, descri bed below.", 3 "intro": "Top-level entries map a policy name to its test parameters, descri bed below.",
4 4
5 "os": ["List of operating systems that support this policy. Valid values:", "win", "linux", "mac", "chromeos"], 5 "os": ["List of operating systems that support this policy. Valid values:", "win", "linux", "mac", "chromeos"],
6 "official_only": "Whether this policy exists in official builds only. Defaul ts to |false| if not specified.", 6 "official_only": "Whether this policy exists in official builds only. Defaul ts to |false| if not specified.",
7 "can_be_recommended": "Whether a recommended value may be set for the policy . Defaults to |false| if not specified.", 7 "can_be_recommended": "Whether a recommended value may be set for the policy . Defaults to |false| if not specified.",
8 "test_policy": "A policy dictionary that should trigger the managed banner i n the settings UI. Usually just sets the current policy.", 8 "test_policy": "A policy dictionary that should trigger the managed banner i n the settings UI. Usually just sets the current policy.",
9 "settings_pages": ["A list of settings pages where the banner should be visi ble when this policy is set."], 9 "settings_pages": ["A list of settings pages where the banner should be visi ble when this policy is set."],
10 "note": "If the policy affects any preferences, the following array should b e specified with one entry per such preference.", 10 "note": "If the policy affects any preferences, the following array should b e specified with one entry per such preference.",
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 ], 455 ],
456 456
457 "note": "TODO(bartfab): Flag this with can_be_recommended when http://crbug. com/106682 is fixed." 457 "note": "TODO(bartfab): Flag this with can_be_recommended when http://crbug. com/106682 is fixed."
458 }, 458 },
459 459
460 "ProxyMode": { 460 "ProxyMode": {
461 "os": ["win", "mac", "linux"], 461 "os": ["win", "mac", "linux"],
462 "test_policy": { "ProxyMode": "direct" }, 462 "test_policy": { "ProxyMode": "direct" },
463 "settings_pages": [], 463 "settings_pages": [],
464 "pref_mappings": [ 464 "pref_mappings": [
465 { "pref": "proxy" } 465 { "pref": "proxy",
466 "indicator_tests": [
467 { "policy": { "ProxyMode": "direct" } }
468 ]
469 }
466 ], 470 ],
467 471
468 "note": "TODO(joaodasilva): Should be chrome://settings-frame. http://crbug. com/97749" 472 "note": "TODO(joaodasilva): Should be chrome://settings-frame. http://crbug. com/97749"
469 }, 473 },
470 474
471 "ProxyServerMode": { 475 "ProxyServerMode": {
472 "os": ["win", "mac", "linux"], 476 "os": ["win", "mac", "linux"],
473 "test_policy": { "ProxyServerMode": 0 }, 477 "test_policy": { "ProxyServerMode": 0 },
474 "settings_pages": [], 478 "settings_pages": [],
475 "pref_mappings": [ 479 "pref_mappings": [
476 { "pref": "proxy" } 480 { "pref": "proxy",
481 "indicator_tests": [
482 { "policy": { "ProxyServerMode": 0 } }
483 ]
484 }
477 ], 485 ],
478 486
479 "note": "TODO(joaodasilva): Should be chrome://settings-frame. http://crbug. com/97749" 487 "note": "TODO(joaodasilva): Should be chrome://settings-frame. http://crbug. com/97749"
480 }, 488 },
481 489
482 "ProxyServer": { 490 "ProxyServer": {
483 "os": ["win", "mac", "linux"], 491 "os": ["win", "mac", "linux"],
484 "test_policy": { "ProxyMode": "fixed_servers", "ProxyServer": "http://localh ost:8080" }, 492 "test_policy": { "ProxyMode": "fixed_servers", "ProxyServer": "http://localh ost:8080" },
485 "settings_pages": [], 493 "settings_pages": [],
486 "pref_mappings": [ 494 "pref_mappings": [
487 { "pref": "proxy" } 495 { "pref": "proxy",
496 "indicator_tests": [
497 { "policy": { "ProxyMode": "fixed_servers", "ProxyServer": "http://loc alhost:8080" } }
498 ]
499 }
488 ] 500 ]
489 }, 501 },
490 502
491 "ProxyPacUrl": { 503 "ProxyPacUrl": {
492 "os": ["win", "mac", "linux"], 504 "os": ["win", "mac", "linux"],
493 "test_policy": { "ProxyMode": "pac_script", "ProxyPacUrl": "http://localhost :8080/proxy.pac" }, 505 "test_policy": { "ProxyMode": "pac_script", "ProxyPacUrl": "http://localhost :8080/proxy.pac" },
494 "settings_pages": [], 506 "settings_pages": [],
495 "pref_mappings": [ 507 "pref_mappings": [
496 { "pref": "proxy" } 508 { "pref": "proxy",
509 "indicator_tests": [
510 { "policy": { "ProxyMode": "pac_script", "ProxyPacUrl": "http://localh ost:8080/proxy.pac" } }
511 ]
512 }
497 ] 513 ]
498 }, 514 },
499 515
500 "ProxyBypassList": { 516 "ProxyBypassList": {
501 "os": ["win", "mac", "linux"], 517 "os": ["win", "mac", "linux"],
502 "test_policy": { "ProxyMode": "fixed_servers", "ProxyServer": "http://localh ost:8080", "ProxyBypassList": "localhost" }, 518 "test_policy": { "ProxyMode": "fixed_servers", "ProxyServer": "http://localh ost:8080", "ProxyBypassList": "localhost" },
503 "settings_pages": [], 519 "settings_pages": [],
504 "pref_mappings": [ 520 "pref_mappings": [
505 { "pref": "proxy" } 521 { "pref": "proxy",
522 "indicator_tests": [
523 { "policy": { "ProxyMode": "fixed_servers", "ProxyServer": "http://loc alhost:8080", "ProxyBypassList": "localhost" } }
524 ]
525 }
506 ] 526 ]
507 }, 527 },
508 528
509 "ProxySettings": { 529 "ProxySettings": {
510 "os": ["linux", "win"], 530 "os": ["linux", "win"],
511 "test_policy": { "ProxySettings": { "ProxyMode": "direct" } }, 531 "test_policy": { "ProxySettings": { "ProxyMode": "direct" } },
512 "settings_pages": [], 532 "settings_pages": [],
513 "pref_mappings": [ 533 "pref_mappings": [
514 { "pref": "proxy" } 534 { "pref": "proxy",
535 "indicator_tests": [
536 { "policy": { "ProxySettings": { "ProxyMode": "direct" } } }
537 ]
538 }
515 ] 539 ]
516 }, 540 },
517 541
518 "EnableOriginBoundCerts": { 542 "EnableOriginBoundCerts": {
519 "os": ["win", "mac", "linux"], 543 "os": ["win", "mac", "linux"],
520 "test_policy": { "EnableOriginBoundCerts": true }, 544 "test_policy": { "EnableOriginBoundCerts": true },
521 "settings_pages": [], 545 "settings_pages": [],
522 "pref_mappings": [ 546 "pref_mappings": [
523 { "pref": "ssl.origin_bound_certs.enabled", 547 { "pref": "ssl.origin_bound_certs.enabled",
524 "local_state": true 548 "local_state": true
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1682 "test_policy": { "GCFUserDataDir": "${user_name}/test-frame" }, 1706 "test_policy": { "GCFUserDataDir": "${user_name}/test-frame" },
1683 "settings_pages": [] 1707 "settings_pages": []
1684 }, 1708 },
1685 1709
1686 "AdditionalLaunchParameters": { 1710 "AdditionalLaunchParameters": {
1687 "os": [], 1711 "os": [],
1688 "test_policy": { "AdditionalLaunchParameters": "--enable-media-stream" }, 1712 "test_policy": { "AdditionalLaunchParameters": "--enable-media-stream" },
1689 "settings_pages": [] 1713 "settings_pages": []
1690 } 1714 }
1691 } 1715 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/core_options_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698