diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 16:37:34 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 16:37:34 +0000 |
| commit | 76e4294ef20fb55b5509dfb12526c047ca0205bb (patch) | |
| tree | 5485e84dd28579fa3ca513feba9575a3ccaef8af /chrome/app | |
| parent | 9eb745adde5ad661542a34ac86d88561f58e23ca (diff) | |
| download | chromium_src-76e4294ef20fb55b5509dfb12526c047ca0205bb.zip chromium_src-76e4294ef20fb55b5509dfb12526c047ca0205bb.tar.gz chromium_src-76e4294ef20fb55b5509dfb12526c047ca0205bb.tar.bz2 | |
Add a ChromeOsLockOnIdleSuspend policy for ChromeOs.
The policy is wired with settings.enable_screen_lock.
BUG=chromium-os:6546
TEST=Create a policy json file and verify the screen lock checkbox is managed in "Person stuff" options page.
Review URL: http://codereview.chromium.org/3611012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/policy/policy_templates.grd | 19 | ||||
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 10 |
2 files changed, 28 insertions, 1 deletions
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd index 3d75ecb..04b2e5d 100644 --- a/chrome/app/policy/policy_templates.grd +++ b/chrome/app/policy/policy_templates.grd @@ -495,7 +495,7 @@ templates and will be translated for each locale. --> You can specify the default search provider to be used by setting the rest of the default search policies. If these are left empty, the user can choose the default provider. If you diable this setting, no search is performed when the user enters non-URL text in the omnibox. - + If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME"> $1<ex>Google Chrome</ex> </ph>. @@ -591,6 +591,23 @@ templates and will be translated for each locale. --> </message> <!-- End Chrome Frame messages --> + <!-- Begin ChromeOs messages --> + <message name="IDS_POLICY_CHROMEOSLOCKONIDLESUSPEND_CAPTION" + desc="Caption of ChromeOsLockOnIdleSuspend policy"> + Enable lock when ChromeOS devices become idle or suspended. + </message> + <message name="IDS_POLICY_CHROMEOSLOCKONIDLESUSPEND_DESC" + desc="Description of ChromeOsLockOnIdleSuspend policy"> + Enable lock when ChromeOS devices become idle or suspended. + + If you enable this setting, users will be asked for a password to unlock ChromeOS devices from sleep. + + If you disable this setting, users will not be asked for a password to wake ChromeOS devices from sleep. + + If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome OS</ex></ph>. + </message> + <!-- End ChromeOs messages --> + <!-- Generated documentation messages --> <message name="IDS_POLICY_DOC_DATA_TYPE" desc="Caption text of the field 'data type' in the summary chart of a policy in the generated documentation"> diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index 70a2c52..200ccbb 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -480,6 +480,16 @@ } }], }, + { + 'name': 'ChromeOsLockOnIdleSuspend', + 'type': 'main', + 'annotations': { + 'platforms': ['linux'], # Note this should be ChromeOs. + 'products': ['chrome'], + 'features': {'dynamic_refresh': 1}, + 'example_value': True, + } + }, ], 'placeholders': [ # Note: keys $1 and $3 are reserved for Chromium and Chromium Frame. |