Index: chrome/browser/policy/proto/chrome_device_policy.proto |
diff --git a/chrome/browser/policy/proto/chrome_device_policy.proto b/chrome/browser/policy/proto/chrome_device_policy.proto |
index 5b5f0af0fec8ab02b13a4ef1d276a5559c53147b..0dc2476dc401bb25af63d569156eb5fb83550794 100644 |
--- a/chrome/browser/policy/proto/chrome_device_policy.proto |
+++ b/chrome/browser/policy/proto/chrome_device_policy.proto |
@@ -109,6 +109,28 @@ message AppPackProto { |
repeated AppPackEntryProto app_pack = 1; |
} |
+message ForcedLogoutTimeoutsProto { |
+ // All timeouts are specified in milliseconds. |
+ |
+ // Specifies the timeout before an idle user session is terminated. |
+ // If this field is omitted or set to 0, no idle timeout will be performed. |
Mattias Nissler (ping if slow)
2012/03/01 19:58:10
"no idle timeout will be performed": Not clear wha
pastarmovj
2012/03/05 17:02:55
Done.
|
+ optional int64 idle_logout_timeout = 1; |
+ // Specifies the duration of a warning countdown before the user is logged out |
+ // because of idleness as specified by the |idle_logout_timeout| value. |
+ // This field is only used if |idle_logout_timeout| is specified. |
Mattias Nissler (ping if slow)
2012/03/01 19:58:10
not quite accurate, should be if |idle_logut_timeo
pastarmovj
2012/03/05 17:02:55
Done.
|
+ optional int64 idle_logout_warning_duration = 2; |
+} |
+ |
+message ScreenSaverProto { |
+ // Specifies the extension ID which is to be used as a screen saver. |
Mattias Nissler (ping if slow)
2012/03/01 19:58:10
We should point out that this screen saver applies
pastarmovj
2012/03/05 17:02:55
Done.
|
+ optional string screen_saver_extension_id = 1; |
+ // Specified in milliseconds the timeout before the screen saver is activated |
Mattias Nissler (ping if slow)
2012/03/01 19:58:10
grammar
pastarmovj
2012/03/05 17:02:55
Done.
|
+ // on the login screen if no user activity present. Only respected if the |
Mattias Nissler (ping if slow)
2012/03/01 19:58:10
oh, so here it says login screen. Can we move that
pastarmovj
2012/03/05 17:02:55
Done.
|
+ // device is in KIOSK mode. |
+ // If this field is omitted or set to 0, no screen-saver will be started. |
+ optional int64 screen_saver_timeout = 2; |
+} |
+ |
message ChromeDeviceSettingsProto { |
optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1; |
optional UserWhitelistProto user_whitelist = 2; |
@@ -124,4 +146,6 @@ message ChromeDeviceSettingsProto { |
optional DeviceReportingProto device_reporting = 12; |
optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13; |
optional AppPackProto app_pack = 14; |
+ optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15; |
+ optional ScreenSaverProto screen_saver = 16; |
} |