Chromium Code Reviews| Index: chrome/browser/chromeos/policy/proto/chrome_device_policy.proto |
| diff --git a/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto b/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto |
| index 818c4699d2bcc523f112719a3af0986d30989296..4c458947545aaa734dc6cad1ab2af59acbbbdb7b 100644 |
| --- a/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto |
| +++ b/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto |
| @@ -106,54 +106,6 @@ message EphemeralUsersEnabledProto { |
| optional bool ephemeral_users_enabled = 1; |
| } |
| -// Details of an extension to install as part of the AppPack. |
| -message AppPackEntryProto { |
| - optional string extension_id = 1; |
| - optional string update_url = 2; |
| - |
| - // This field was added but never used and there are no plans to support it |
| - // eventually either. |
| - optional bool OBSOLETE_online_only = 3 [deprecated = true]; |
| -} |
| - |
| -message AppPackProto { |
| - // List of extensions to install as part of the AppPack. |
| - repeated AppPackEntryProto app_pack = 1; |
| -} |
| - |
| -// This is a special policy for kiosk/retail mode that specifies what apps |
| -// should be pinned to the launcher. For regular accounts, pinned apps are |
| -// controlled through user policy. |
| -message PinnedAppsProto { |
| - // App IDs for the apps to pin. |
| - repeated string app_id = 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 logout on idle will be performed. |
| - 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| != 0 is specified. |
| - optional int64 idle_logout_warning_duration = 2; |
| -} |
| - |
| -message ScreenSaverProto { |
| - // Specifies the extension ID which is to be used as a screen saver on the |
| - // login screen if no user activity is present. Only respected if the device |
| - // is in RETAIL mode. |
| - optional string screen_saver_extension_id = 1; |
| - |
| - // Specifies the timeout before the screen saver is activated. If this field |
| - // is omitted or set to 0, no screen-saver will be started. |
| - // Measured in milliseconds. |
| - optional int64 screen_saver_timeout = 2; |
| -} |
| - |
| // Enterprise controls for auto-update behavior of Chrome OS. |
| message AutoUpdateSettingsProto { |
| // True if we don't want the device to auto-update (target_version_prefix is |
| @@ -226,12 +178,6 @@ message AutoUpdateSettingsProto { |
| optional bool p2p_enabled = 9 [default = false]; |
| } |
| -message StartUpUrlsProto { |
| - // Specifies the URLs to be loaded on login to the anonymous account used if |
| - // the device is in RETAIL mode. |
| - repeated string start_up_urls = 1; |
| -} |
| - |
| message SystemTimezoneProto { |
| // Specifies an owner-determined timezone that applies to the login screen and |
| // all users. Valid values are listed in "timezone_settings.cc". Additionally, |
| @@ -595,12 +541,7 @@ message ChromeDeviceSettingsProto { |
| optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11; |
| optional DeviceReportingProto device_reporting = 12; |
| optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13; |
| - optional AppPackProto app_pack = 14; |
| - optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15; |
| - optional ScreenSaverProto login_screen_saver = 16; |
|
Mattias Nissler (ping if slow)
2014/10/02 09:56:47
Please deprecate these fields properly (to avoid a
rkc
2014/11/20 21:06:34
Done.
|
| optional AutoUpdateSettingsProto auto_update_settings = 17; |
| - optional StartUpUrlsProto start_up_urls = 18; |
| - optional PinnedAppsProto pinned_apps = 19; |
| optional SystemTimezoneProto system_timezone = 20; |
| optional DeviceLocalAccountsProto device_local_accounts = 21; |
| optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22; |