Remove retail mode.

chrome/browser/chromeos/settings/device_settings_provider.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/chromeos/settings/device_settings_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 33 matching lines @@
   kAccountsPrefDeviceLocalAccountAutoLoginDelay,
   kAccountsPrefDeviceLocalAccountAutoLoginId,
   kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline,
   kAccountsPrefEphemeralUsersEnabled,
   kAccountsPrefShowUserNamesOnSignIn,
   kAccountsPrefSupervisedUsersEnabled,
   kAccountsPrefTransferSAMLCookies,
   kAccountsPrefUsers,
   kAllowRedeemChromeOsRegistrationOffers,
   kAllowedConnectionTypesForUpdate,
   kAppPack,

[bartfab (slow), 2014/10/15 09:52:21]

Nit: No longer used.

[rkc, 2014/11/20 21:06:34]

Done.

   kAttestationForContentProtectionEnabled,
   kDeviceAttestationEnabled,
   kDeviceOwner,
   kIdleLogoutTimeout,

[bartfab (slow), 2014/10/15 09:52:21]

Nit: No longer used.

[rkc, 2014/11/20 21:06:34]

Done.

   kIdleLogoutWarningDuration,

[bartfab (slow), 2014/10/15 09:52:21]

Nit: No longer used.

[rkc, 2014/11/20 21:06:34]

Done.

   kPolicyMissingMitigationMode,
   kReleaseChannel,
   kReleaseChannelDelegated,
   kReportDeviceActivityTimes,
   kReportDeviceBootMode,
   kReportDeviceLocation,
   kReportDeviceNetworkInterfaces,
   kReportDeviceUsers,
   kReportDeviceVersionInfo,
   kScreenSaverExtensionId,

[bartfab (slow), 2014/10/15 09:52:21]

Nit: No longer used.

[rkc, 2014/11/20 21:06:34]

Done.

   kScreenSaverTimeout,

[bartfab (slow), 2014/10/15 09:52:20]

Nit: No longer used.

[rkc, 2014/11/20 21:06:34]

Done.

   kServiceAccountIdentity,
   kSignedDataRoamingEnabled,
   kStartUpFlags,
-  kStartUpUrls,
   kStatsReportingPref,
   kSystemTimezonePolicy,
   kSystemUse24HourClock,
   kUpdateDisabled,
   kVariationsRestrictParameter,
 };
 
 bool HasOldMetricsFile() {
   // TODO(pastarmovj): Remove this once migration is not needed anymore.
   // If the value is not set we should try to migrate legacy consent file.
@@ skipping 140 matching lines @@
     new_values_cache->SetValue(kStartUpFlags, list);
   }
 
   if (policy.has_saml_settings()) {
     new_values_cache->SetBoolean(
         kAccountsPrefTransferSAMLCookies,
         policy.saml_settings().transfer_saml_cookies());
   }
 }
 
-void DecodeKioskPolicies(
-    const em::ChromeDeviceSettingsProto& policy,
-    PrefValueMap* new_values_cache) {
-  if (policy.has_forced_logout_timeouts()) {
-    if (policy.forced_logout_timeouts().has_idle_logout_timeout()) {
-      new_values_cache->SetInteger(
-          kIdleLogoutTimeout,
-          policy.forced_logout_timeouts().idle_logout_timeout());
-    }
-
-    if (policy.forced_logout_timeouts().has_idle_logout_warning_duration()) {
-      new_values_cache->SetInteger(
-          kIdleLogoutWarningDuration,
-          policy.forced_logout_timeouts().idle_logout_warning_duration());
-    }
-  }
-
-  if (policy.has_login_screen_saver()) {
-    if (policy.login_screen_saver().has_screen_saver_timeout()) {
-      new_values_cache->SetInteger(
-          kScreenSaverTimeout,
-          policy.login_screen_saver().screen_saver_timeout());
-    }
-
-    if (policy.login_screen_saver().has_screen_saver_extension_id()) {
-      new_values_cache->SetString(
-          kScreenSaverExtensionId,
-          policy.login_screen_saver().screen_saver_extension_id());
-    }
-  }
-
-  if (policy.has_app_pack()) {
-    typedef RepeatedPtrField<em::AppPackEntryProto> proto_type;
-    base::ListValue* list = new base::ListValue;
-    const proto_type& app_pack = policy.app_pack().app_pack();
-    for (proto_type::const_iterator it = app_pack.begin();
-         it != app_pack.end(); ++it) {
-      base::DictionaryValue* entry = new base::DictionaryValue;
-      if (it->has_extension_id()) {
-        entry->SetStringWithoutPathExpansion(kAppPackKeyExtensionId,
-                                             it->extension_id());
-      }
-      if (it->has_update_url()) {
-        entry->SetStringWithoutPathExpansion(kAppPackKeyUpdateUrl,
-                                             it->update_url());
-      }
-      list->Append(entry);
-    }
-    new_values_cache->SetValue(kAppPack, list);
-  }
-
-  if (policy.has_start_up_urls()) {
-    base::ListValue* list = new base::ListValue();
-    const em::StartUpUrlsProto& urls_proto = policy.start_up_urls();
-    const RepeatedPtrField<std::string>& urls = urls_proto.start_up_urls();
-    for (RepeatedPtrField<std::string>::const_iterator it = urls.begin();
-         it != urls.end(); ++it) {
-      list->Append(new base::StringValue(*it));
-    }
-    new_values_cache->SetValue(kStartUpUrls, list);
-  }
-}
-
 void DecodeNetworkPolicies(
     const em::ChromeDeviceSettingsProto& policy,
     PrefValueMap* new_values_cache) {
   // kSignedDataRoamingEnabled has a default value of false.
   new_values_cache->SetBoolean(
       kSignedDataRoamingEnabled,
       policy.has_data_roaming_enabled() &&
       policy.data_roaming_enabled().has_data_roaming_enabled() &&
       policy.data_roaming_enabled().data_roaming_enabled());
 }
@@ skipping 427 matching lines @@
     bool setting_enabled;
     if (value->GetAsBoolean(&setting_enabled)) {
       attestation_settings->set_content_protection_enabled(setting_enabled);
     } else {
       NOTREACHED();
     }
   } else {
     // The remaining settings don't support Set(), since they are not
     // intended to be customizable by the user:
     //   kAccountsPrefTransferSAMLCookies
     //   kAppPack

[bartfab (slow), 2014/10/15 09:52:21]

Nit: No longer used.

[rkc, 2014/11/20 21:06:34]

Done.

     //   kDeviceAttestationEnabled
     //   kDeviceOwner
     //   kIdleLogoutTimeout

[bartfab (slow), 2014/10/15 09:52:21]

Nit: No longer used.

[rkc, 2014/11/20 21:06:34]

Done.

     //   kIdleLogoutWarningDuration

[bartfab (slow), 2014/10/15 09:52:20]

Nit: No longer used.

[rkc, 2014/11/20 21:06:34]

Done.

     //   kReleaseChannelDelegated
     //   kReportDeviceActivityTimes
     //   kReportDeviceBootMode
     //   kReportDeviceLocation
     //   kReportDeviceVersionInfo
     //   kReportDeviceNetworkInterfaces
     //   kReportDeviceUsers
     //   kScreenSaverExtensionId

[bartfab (slow), 2014/10/15 09:52:21]

Nit: No longer used.

[rkc, 2014/11/20 21:06:34]

Done.

     //   kScreenSaverTimeout

[bartfab (slow), 2014/10/15 09:52:21]

Nit: No longer used.

[rkc, 2014/11/20 21:06:34]

Done.

     //   kServiceAccountIdentity
     //   kStartUpUrls
     //   kSystemTimezonePolicy
     //   kVariationsRestrictParameter
 
     LOG(FATAL) << "Device setting " << prop << " is read-only.";
   }
 
   em::PolicyData data;
   data.set_username(device_settings_service_->GetUsername());
@@ skipping 23 matching lines @@
 
   if (policy_data.has_username() && !policy_data.has_request_token())
     new_values_cache.SetString(kDeviceOwner, policy_data.username());
 
   if (policy_data.has_service_account_identity()) {
     new_values_cache.SetString(kServiceAccountIdentity,
                                policy_data.service_account_identity());
   }
 
   DecodeLoginPolicies(settings, &new_values_cache);
-  DecodeKioskPolicies(settings, &new_values_cache);
   DecodeNetworkPolicies(settings, &new_values_cache);
   DecodeAutoUpdatePolicies(settings, &new_values_cache);
   DecodeReportingPolicies(settings, &new_values_cache);
   DecodeGenericPolicies(settings, &new_values_cache);
 
   // Collect all notifications but send them only after we have swapped the
   // cache so that if somebody actually reads the cache will be already valid.
   std::vector<std::string> notifications;
   // Go through the new values and verify in the old ones.
   PrefValueMap::iterator iter = new_values_cache.begin();
@@ skipping 191 matching lines @@
 void DeviceSettingsProvider::AttemptMigration() {
   if (device_settings_service_->HasPrivateOwnerKey()) {
     PrefValueMap::const_iterator i;
     for (i = migration_values_.begin(); i != migration_values_.end(); ++i)
       DoSet(i->first, *i->second);
     migration_values_.Clear();
   }
 }
 
 }  // namespace chromeos