diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 18:17:51 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 18:17:51 +0000 |
| commit | 22fc143af3e0cb80d39ad0614759ead6c20ba7b5 (patch) | |
| tree | 2c6820d88ba4bfc4174b027b678418316a6767bb /chrome/app/policy/policy_templates.json | |
| parent | 7e9af81834cc012131ca509808c8c6b73cc05604 (diff) | |
| download | chromium_src-22fc143af3e0cb80d39ad0614759ead6c20ba7b5.zip chromium_src-22fc143af3e0cb80d39ad0614759ead6c20ba7b5.tar.gz chromium_src-22fc143af3e0cb80d39ad0614759ead6c20ba7b5.tar.bz2 | |
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
Diffstat (limited to 'chrome/app/policy/policy_templates.json')
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 19 |
1 files changed, 17 insertions, 2 deletions
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': [ { |