| Index: chrome/browser/chromeos/settings/device_settings_provider.cc
|
| diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| index 7c2196f563169d377d386ca0f534efcb83240d41..3970677dad82470009cce8850013dc18ae8d3dec 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| @@ -39,48 +39,49 @@ namespace {
|
|
|
| // List of settings handled by the DeviceSettingsProvider.
|
| const char* const kKnownSettings[] = {
|
| - kAccountsPrefAllowGuest,
|
| - kAccountsPrefAllowNewUser,
|
| - kAccountsPrefDeviceLocalAccounts,
|
| - kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled,
|
| - kAccountsPrefDeviceLocalAccountAutoLoginDelay,
|
| - kAccountsPrefDeviceLocalAccountAutoLoginId,
|
| - kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline,
|
| - kAccountsPrefEphemeralUsersEnabled,
|
| - kAccountsPrefShowUserNamesOnSignIn,
|
| - kAccountsPrefSupervisedUsersEnabled,
|
| - kAccountsPrefTransferSAMLCookies,
|
| - kAccountsPrefUsers,
|
| - kAllowRedeemChromeOsRegistrationOffers,
|
| - kAllowedConnectionTypesForUpdate,
|
| - kAppPack,
|
| - kAttestationForContentProtectionEnabled,
|
| - kDeviceAttestationEnabled,
|
| - kDeviceOwner,
|
| - kIdleLogoutTimeout,
|
| - kIdleLogoutWarningDuration,
|
| - kPolicyMissingMitigationMode,
|
| - kReleaseChannel,
|
| - kReleaseChannelDelegated,
|
| - kReportDeviceActivityTimes,
|
| - kReportDeviceBootMode,
|
| - kReportDeviceLocation,
|
| - kReportDeviceNetworkInterfaces,
|
| - kReportDeviceUsers,
|
| - kReportDeviceVersionInfo,
|
| - kScreenSaverExtensionId,
|
| - kScreenSaverTimeout,
|
| - kServiceAccountIdentity,
|
| - kSignedDataRoamingEnabled,
|
| - kStartUpFlags,
|
| - kStartUpUrls,
|
| - kStatsReportingPref,
|
| - kSystemTimezonePolicy,
|
| - kSystemUse24HourClock,
|
| - kUpdateDisabled,
|
| - kVariationsRestrictParameter,
|
| - kDeviceDisabled,
|
| - kDeviceDisabledMessage,
|
| + kAccountsPrefAllowGuest,
|
| + kAccountsPrefAllowNewUser,
|
| + kAccountsPrefDeviceLocalAccounts,
|
| + kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled,
|
| + kAccountsPrefDeviceLocalAccountAutoLoginDelay,
|
| + kAccountsPrefDeviceLocalAccountAutoLoginId,
|
| + kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline,
|
| + kAccountsPrefEphemeralUsersEnabled,
|
| + kAccountsPrefShowUserNamesOnSignIn,
|
| + kAccountsPrefSupervisedUsersEnabled,
|
| + kAccountsPrefTransferSAMLCookies,
|
| + kAccountsPrefUsers,
|
| + kAllowRedeemChromeOsRegistrationOffers,
|
| + kAllowedConnectionTypesForUpdate,
|
| + kAppPack,
|
| + kAttestationForContentProtectionEnabled,
|
| + kDeviceAttestationEnabled,
|
| + kDeviceOwner,
|
| + kIdleLogoutTimeout,
|
| + kIdleLogoutWarningDuration,
|
| + kPolicyMissingMitigationMode,
|
| + kReleaseChannel,
|
| + kReleaseChannelDelegated,
|
| + kReportDeviceActivityTimes,
|
| + kReportDeviceBootMode,
|
| + kReportDeviceLocation,
|
| + kReportDeviceNetworkInterfaces,
|
| + kReportDeviceUsers,
|
| + kReportDeviceVersionInfo,
|
| + kScreenSaverExtensionId,
|
| + kScreenSaverTimeout,
|
| + kServiceAccountIdentity,
|
| + kSignedDataRoamingEnabled,
|
| + kStartUpFlags,
|
| + kStartUpUrls,
|
| + kStatsReportingPref,
|
| + kSystemTimezonePolicy,
|
| + kSystemUse24HourClock,
|
| + kUpdateDisabled,
|
| + kVariationsRestrictParameter,
|
| + kDeviceDisabled,
|
| + kDeviceDisabledMessage,
|
| + kShutdownIsReboot,
|
| };
|
|
|
| bool HasOldMetricsFile() {
|
| @@ -120,6 +121,12 @@ void DecodeLoginPolicies(
|
| }
|
|
|
| new_values_cache->SetBoolean(
|
| + kShutdownIsReboot,
|
| + policy.has_shutdown_is_reboot() &&
|
| + policy.shutdown_is_reboot().has_shutdown_is_reboot() &&
|
| + policy.shutdown_is_reboot().shutdown_is_reboot());
|
| +
|
| + new_values_cache->SetBoolean(
|
| kAccountsPrefAllowGuest,
|
| !policy.has_guest_mode_enabled() ||
|
| !policy.guest_mode_enabled().has_guest_mode_enabled() ||
|
|
|