Chromium Code Reviews| Index: chrome/browser/chromeos/system/timezone_resolver_manager.cc |
| diff --git a/chrome/browser/chromeos/system/timezone_resolver_manager.cc b/chrome/browser/chromeos/system/timezone_resolver_manager.cc |
| index ac9f3586e9be59299e067fa283bab8e3f4363559..6b28bbbb36d4fb1ff2b24f08ff016dba6366c17c 100644 |
| --- a/chrome/browser/chromeos/system/timezone_resolver_manager.cc |
| +++ b/chrome/browser/chromeos/system/timezone_resolver_manager.cc |
| @@ -54,6 +54,8 @@ ServiceConfiguration GetServiceConfigurationFromAutomaticDetectionPolicy() { |
| return SHOULD_START; |
| case enterprise_management::SystemTimezoneProto::SEND_WIFI_ACCESS_POINTS: |
| return SHOULD_START; |
| + case enterprise_management::SystemTimezoneProto::SEND_ALL_LOCATION_INFO: |
| + return SHOULD_START; |
| } |
| // Default for unknown policy value. |
| NOTREACHED() << "Unrecognized policy value: " << policy_value; |
| @@ -128,6 +130,21 @@ void TimeZoneResolverManager::SetPrimaryUserPrefs(PrefService* pref_service) { |
| } |
| bool TimeZoneResolverManager::ShouldSendWiFiGeolocationData() { |
| + return ( |
| + CheckTimezoneManagementSetting( |
| + enterprise_management::SystemTimezoneProto:: |
| + SEND_WIFI_ACCESS_POINTS) || |
| + CheckTimezoneManagementSetting( |
| + enterprise_management::SystemTimezoneProto::SEND_ALL_LOCATION_INFO)); |
| +} |
| + |
| +bool TimeZoneResolverManager::ShouldSendCellularGeolocationData() { |
| + return CheckTimezoneManagementSetting( |
| + enterprise_management::SystemTimezoneProto::SEND_ALL_LOCATION_INFO); |
| +} |
| + |
| +bool TimeZoneResolverManager::CheckTimezoneManagementSetting( |
| + int expected_policy_value) { |
| PrefService* local_state = g_browser_process->local_state(); |
| const bool is_managed = local_state->IsManagedPreference( |
| prefs::kSystemTimezoneAutomaticDetectionPolicy); |
| @@ -140,8 +157,7 @@ bool TimeZoneResolverManager::ShouldSendWiFiGeolocationData() { |
| DCHECK(policy_value <= enterprise_management::SystemTimezoneProto:: |
| AutomaticTimezoneDetectionType_MAX); |
|
stevenjb (google-dont-use)
2017/02/09 00:13:28
Sorry, I should have suggested this the first time
can Skylar cook
2017/02/09 19:44:30
Done.
|
| - return policy_value == |
| - enterprise_management::SystemTimezoneProto::SEND_WIFI_ACCESS_POINTS; |
| + return policy_value == expected_policy_value; |
| } |
| void TimeZoneResolverManager::UpdateTimezoneResolver() { |