From 22fc143af3e0cb80d39ad0614759ead6c20ba7b5 Mon Sep 17 00:00:00 2001
From: "markusheintz@chromium.org"
 <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 31 Aug 2010 18:17:51 +0000
Subject: Since we are now able to auto generate ADM and ADMX/ADML templates,
 we do not need any manually created and maintained policy-templates anymore.
 Therefor we delete them.

BUG=none
TEST=manual

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58025 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/policy/policy_templates.json | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'chrome/app/policy/policy_templates.json')

diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index 792b4d5..166c594 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -152,8 +152,8 @@
     {
       'name': 'DisabledPlugins',
       'policies': [{
-        'name': 'DisabledPluginsList',
-        'type': 'string',
+        'name': 'DisabledPlugins',
+        'type': 'list',
       }]
     },
     {
@@ -211,6 +211,21 @@
         'type': 'main',
       }]
     },
+    {
+      'name': 'RestoreOnStartup',
+      'policies': [{
+        'name': 'RestoreOnStartupMode',
+	'type': 'enum',
+	'items': [
+	  {'name': 'RestoreOnStartupIsNone', 'value': '0'},
+	  {'name': 'RestoreOnStartupIsLastSession', 'value': '1'},
+	  {'name': 'RestoreOnStartupIsURLs', 'value': '4'},
+	],
+      },{
+        'name': 'RestoreOnStartupURLs',
+	'type': 'list',
+      }]
+    },
   ],
   'placeholders': [
     {
-- 
cgit v1.1