Remove retail mode.

chrome/browser/chromeos/policy/proto/chrome_device_policy.proto

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
 package enterprise_management;
 
@@ skipping 89 matching lines @@
 }
 
 message EphemeralUsersEnabledProto {
   // Determines whether users should be treated as ephemeral. In ephemeral users
   // mode, no cryptohome is created for the user, but a tmpfs mount is used
   // instead such that upon logout all user state is discarded.
   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;
+message OBSOLETE_AppPackEntryProto {
+  optional string OBSOLETE_extension_id = 1 [deprecated = true];
+  optional string OBSOLETE_update_url = 2 [deprecated = true];
 
   // 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 {
+message OBSOLETE_AppPackProto {
   // List of extensions to install as part of the AppPack.
-  repeated AppPackEntryProto app_pack = 1;
+  repeated OBSOLETE_AppPackEntryProto app_pack = 1 [deprecated = true];
 }
 
 // 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 {

[bartfab (slow), 2014/12/02 21:25:27]

Nit: Add OBSOLETE_.

[rkc, 2014/12/04 19:50:07]

According to Mattias, this is still in use. Something I am missing?

[bartfab (slow), 2014/12/15 16:08:40]

You had accidentally removed the implementation of pinned apps used in regular
sessions in an earlier revision of this CL. That is what Mattias was pointing
out. This here is the retail-mode-specific implementation of pinned apps, which
should be marked as obsolete.

[rkc, 2014/12/15 20:45:57]

Ah - okay, marked this obsolete.
Done.

   // App IDs for the apps to pin.
   repeated string app_id = 1;

[bartfab (slow), 2014/12/02 21:25:27]

Nit: Add OBSOLETE_ and deprecated = true.

[rkc, 2014/12/04 19:50:07]

Ditto.

[bartfab (slow), 2014/12/15 16:08:40]

As above, this is used for retail mode only.

[rkc, 2014/12/15 20:45:57]

Done.

 }
 
-message ForcedLogoutTimeoutsProto {
+message OBSOLETE_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;
+  optional int64 OBSOLETE_idle_logout_timeout = 1 [deprecated = true];
 
   // 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;
+  optional int64 OBSOLETE_idle_logout_warning_duration = 2 [deprecated = true];
 }
 
-message ScreenSaverProto {
+message OBSOLETE_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;
+  optional string OBSOLETE_screen_saver_extension_id = 1 [deprecated = true];
 
   // 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;
+  optional int64 OBSOLETE_screen_saver_timeout = 2 [deprecated = true];
 }
 
 // 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
   // ignored in this case).
   optional bool update_disabled = 1;
 
   // Specifies the prefix of the target version we want the device to
   // update to, if it's on a older version. If the device is already on
@@ skipping 54 matching lines @@
   // is being shown or a kiosk app session is in progress. This will change in
   // the future and the policy will always apply, regardless of whether a
   // session of any particular type is in progress or not.
   optional bool reboot_after_update = 8;
 
   // True if AU payloads may be shared with and consumed from other devices
   // on the LAN, using p2p. False otherwise.
   optional bool p2p_enabled = 9 [default = false];
 }
 
-message StartUpUrlsProto {
+message OBSOLETE_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;
+  repeated string OBSOLETE_start_up_urls = 1 [deprecated = true];
 }
 
 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,
   // timezones from the "IANA Time Zone Database" (e.g. listed on wikipedia)
   // that are equivalent to one of the timezones in "timezone_settings.cc" are
   // valid. In case of an invalid value, the setting is still activated with a
   // fallback timezone (currently "GMT"). In case of an empty string or if no
   // value is provided, the timezone device setting is inactive. In that case,
@@ skipping 347 matching lines @@
   optional DeviceProxySettingsProto device_proxy_settings = 4;
   optional CameraEnabledProto camera_enabled = 5;
   optional ShowUserNamesOnSigninProto show_user_names = 6;
   optional DataRoamingEnabledProto data_roaming_enabled = 7;
   optional AllowNewUsersProto allow_new_users = 8;
   optional MetricsEnabledProto metrics_enabled = 9;
   optional ReleaseChannelProto release_channel = 10;
   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;
+  optional OBSOLETE_AppPackProto app_pack = 14 [deprecated = true];
+  optional OBSOLETE_ForcedLogoutTimeoutsProto forced_logout_timeouts = 15
+      [deprecated = true];
+  optional OBSOLETE_ScreenSaverProto login_screen_saver = 16
+      [deprecated = true];
   optional AutoUpdateSettingsProto auto_update_settings = 17;
-  optional StartUpUrlsProto start_up_urls = 18;
-  optional PinnedAppsProto pinned_apps = 19;
+  optional OBSOLETE_StartUpUrlsProto start_up_urls = 18 [deprecated = true];
+  optional PinnedAppsProto pinned_apps = 19 [deprecated = true];

[bartfab (slow), 2014/12/02 21:25:27]

Nit: Add OBSOLETE_.

[rkc, 2014/12/04 19:50:07]

Ditto, and removed the [deprecated = true].

[bartfab (slow), 2014/12/15 16:08:40]

As above, this is used for retail mode only.

[rkc, 2014/12/15 20:45:57]

Done.

   optional SystemTimezoneProto system_timezone = 20;
   optional DeviceLocalAccountsProto device_local_accounts = 21;
   optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22;
   optional StartUpFlagsProto start_up_flags = 23;
   optional UptimeLimitProto uptime_limit = 24;
   optional VariationsParameterProto variations_parameter = 25;
   optional AttestationSettingsProto attestation_settings = 26;
   optional AccessibilitySettingsProto accessibility_settings = 27;
   optional SupervisedUsersSettingsProto supervised_users_settings = 28;
   optional LoginScreenPowerManagementProto login_screen_power_management = 29;
   optional SystemUse24HourClockProto use_24hour_clock = 30;
   optional AutoCleanupSettigsProto auto_clean_up_settings = 31;
   optional SystemSettingsProto system_settings = 32;
   optional SAMLSettingsProto saml_settings = 33;
 }