diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 12:19:33 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 12:19:33 +0000 |
| commit | d0af207cd0b031db69ed3d2c6b60a15783c79946 (patch) | |
| tree | aacad8a242dc53b3fc3fcdf77b3a1184e91bd5e9 /chrome/app/policy | |
| parent | 35bd642d11361031d4989bbcb1e3f8271cfcf247 (diff) | |
| download | chromium_src-d0af207cd0b031db69ed3d2c6b60a15783c79946.zip chromium_src-d0af207cd0b031db69ed3d2c6b60a15783c79946.tar.gz chromium_src-d0af207cd0b031db69ed3d2c6b60a15783c79946.tar.bz2 | |
Revert r150536 - "Added a timezone policy and pyauto tests for it."
It broke unit tests on Chrome OS.
BUG=None
TBR=pneubeck@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10829235
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy')
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index 23b6814..79eb0ca 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -112,7 +112,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: 157 +# For your editing convenience: highest ID currently used: 156 # # Placeholders: # The following placeholder strings are automatically substituted: @@ -3150,22 +3150,6 @@ If disabled or not specified, taking screenshots is allowed.''' }, - { - 'name': 'DeviceTimezone', - 'type': 'string', - 'schema': { 'type': 'string' }, - 'supported_on': ['chrome_os:22-'], - 'device_only': True, - 'features': {'dynamic_refresh': True}, - 'example_value': 'America/Los_Angeles', - 'id': 157, - 'caption': '''Timezone''', - 'desc': '''Specifies the timezone to be used for the device. Users can override the specified timezone for the current session. - However, on logout it is set back to the specified timezone. - - If this policy is not used or set to an invalid value, users can change the timezone and the change is persistent. Thus a change affects the login-screen and other users. - If additionally no user ever set a timezone, a default value (currently "US/Pacific") is used.''', - }, ], 'messages': { # Messages that are not associated to any policies. |