Add content_settings::PolicyProvider and a set of new policies to managed content settings.

BUG=63656,63182
TEST=content_settings_policy_provider_unittest.cc,host_content_settings_map_unittests.cc

Review URL: http://codereview.chromium.org/6542048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76224 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 111 insertions, 1 deletions

diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index a832000..dc3dd27 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -91,7 +91,7 @@
 #   persistent IDs for all fields (but not for groups!) are needed. These are
 #   specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
 #   because doing so would break the deployed wire format!
-#   For your editing convenience: highest ID currently used: 66
+#   For your editing convenience: highest ID currently used: 77
 #
   'policy_definitions': [
     {
@@ -1110,6 +1110,116 @@
           'caption': '''Default geolocation setting''',
           'desc': '''Allows you to set whether websites are allowed to track the users' physical location. Tracking the users' physical location can be allowed by default, denied by default or the user can be asked everytime a website requests the pysical location.''',
         },
+        {
+          'name': 'CookiesAllowedForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 77,
+          'caption': '''Allow cookies on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are allowed to set cookies.''',
+        },
+        {
+          'name': 'CookiesBlockedForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 67,
+          'caption': '''Block cookies on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are not allowed to set cookies.''',
+        },
+        {
+          'name': 'CookiesSessionOnlyForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 68,
+          'caption': '''Allow session only cookies on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are allowed to set session only cookies.''',
+        },
+        {
+          'name': 'ImagesAllowedForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 69,
+          'caption': '''Allow images on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are allowed to display images.''',
+        },
+        {
+          'name': 'ImagesBlockedForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 70,
+          'caption': '''Block images on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are not allowed to display images.''',
+        },
+        {
+          'name': 'JavaScriptAllowedForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 71,
+          'caption': '''Allow JavaScript on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are allowed to run JavaScript.''',
+        },
+        {
+          'name': 'JavaScriptBlockedForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 72,
+          'caption': '''Block JavaScript on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are not allowed to run JavaScript.''',
+        },
+        {
+          'name': 'PluginsAllowedForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 73,
+          'caption': '''Allow plugins on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are allowed to run plugins.''',
+        },
+        {
+          'name': 'PluginsBlockedForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 74,
+          'caption': '''Block plugins on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are not allowed to run plugins.''',
+        },
+        {
+          'name': 'PopupsAllowedForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 75,
+          'caption': '''Allow popups on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are allowed to open popups.''',
+        },
+        {
+          'name': 'PopupsBlockedForUrls',
+          'type': 'list',
+          'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
+          'features': {'dynamic_refresh': 1},
+          'example_value': ['http://www.example.com', '[*.]example.edu'],
+          'id': 76,
+          'caption': '''Block popups on these sites''',
+          'desc': '''Allows you to set a list of url patterns that specify sites which are not allowed to open popups.''',
+        }
       ],
     },
     {