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..c0e21b5aab6783f5d4e2266314cb07fa340cc13e 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_NETWORK_INFO: |
| + return SHOULD_START; |
| } |
| // Default for unknown policy value. |
| NOTREACHED() << "Unrecognized policy value: " << policy_value; |
| @@ -128,6 +130,16 @@ void TimeZoneResolverManager::SetPrimaryUserPrefs(PrefService* pref_service) { |
| } |
| bool TimeZoneResolverManager::ShouldSendWiFiGeolocationData() { |
| + return CheckTimezoneManagementSetting( |
| + enterprise_management::SystemTimezoneProto::SEND_WIFI_ACCESS_POINTS); |
|
stevenjb
2017/02/07 23:54:29
Should this be | SEND_ALL_NETWORK_INFO ?
can Skylar cook
2017/02/08 21:15:48
Done.
|
| +} |
| + |
| +bool TimeZoneResolverManager::ShouldSendCellularGeolocationData() { |
| + return CheckTimezoneManagementSetting( |
| + enterprise_management::SystemTimezoneProto::SEND_ALL_NETWORK_INFO); |
| +} |
| + |
| +bool TimeZoneResolverManager::CheckTimezoneManagementSetting(int expected_policy_value){ |
|
stevenjb
2017/02/07 23:54:29
clang format
can Skylar cook
2017/02/08 21:15:48
Done.
|
| PrefService* local_state = g_browser_process->local_state(); |
| const bool is_managed = local_state->IsManagedPreference( |
| prefs::kSystemTimezoneAutomaticDetectionPolicy); |
| @@ -140,8 +152,7 @@ bool TimeZoneResolverManager::ShouldSendWiFiGeolocationData() { |
| DCHECK(policy_value <= enterprise_management::SystemTimezoneProto:: |
| AutomaticTimezoneDetectionType_MAX); |
| - return policy_value == |
| - enterprise_management::SystemTimezoneProto::SEND_WIFI_ACCESS_POINTS; |
| + return policy_value == expected_policy_value; |
| } |
| void TimeZoneResolverManager::UpdateTimezoneResolver() { |