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 07dd07ead8b81d21c56fefef5100ac077cdc4d9c..990e6c7bc9156d9bf0a486fbe8acef9018d3d313 100644 |
--- a/chrome/browser/policy/proto/chrome_device_policy.proto |
+++ b/chrome/browser/policy/proto/chrome_device_policy.proto |
@@ -97,6 +97,34 @@ message EphemeralUsersEnabledProto { |
optional bool ephemeral_users_enabled = 1; |
} |
+message ForcedLogoutTimeoutsProto { |
+ // All timeouts are specified in milliseconds. |
+ |
+ // Specifies the duration of a session before the user is unconditionally |
+ // logged out. |
+ // If omitted or set to 0. No idle timeout will be performed. |
Mattias Nissler (ping if slow)
2012/02/21 10:41:38
Please fix comment grammar, here and below.
pastarmovj
2012/02/22 14:22:27
Done.
|
+ optional int64 forced_logout_timeout = 1; |
+ // Specifies the duration of a warning countdown before the user is logged out |
+ // because of the |forced_logout_timeout| has been set. |
+ // Only used if |forced_logout_timeout| is specified. |
+ optional int64 forced_logout_warning_duration = 2; |
+ // Specifies the timeout before an idle user session is terminated. |
+ // If omitted or set to 0. No idle timeout will be performed. |
+ optional int64 idle_logout_timeout = 3; |
+ // Specifies the duration of a warning countdown before the user is logged out |
+ // because of idleness as specified by the |idle_logout_timeout| value. |
+ // Only used if |idle_logout_timeout| is specified. |
+ optional int64 idle_logout_warning_duration = 4; |
rkc
2012/02/21 18:15:36
What's the difference between this and the forced_
pastarmovj
2012/02/22 14:22:27
I thought somewhere along the course of discussion
rkc
2012/02/22 17:39:07
Ah I see what you mean. No, we don't plan on havin
rkc
2012/02/23 21:10:13
Spoke with Josh; the forced_logout_warning_duratio
|
+} |
+ |
+message ScreenSaverTimeout { |
+ // Specified in milliseconds the timeout before the screen saver is activated |
+ // on the login screen if no user activity present. Only respected if the |
+ // device is in KIOSK mode. |
+ // If omitted or set to 0. No idle timeout will be performed. |
+ optional int64 screen_saver_timeout = 1; |
+} |
+ |
message ChromeDeviceSettingsProto { |
optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1; |
optional UserWhitelistProto user_whitelist = 2; |
@@ -111,4 +139,6 @@ message ChromeDeviceSettingsProto { |
optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11; |
optional DeviceReportingProto device_reporting = 12; |
optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13; |
+ optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 14; |
+ optional ScreenSaverTimeout screen_saver_timeout = 15; |
} |