Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1094)

Unified Diff: chrome/browser/chromeos/system/timezone_resolver_manager.cc

Issue 2624843003: Add support for cellular geolocation (Closed)
Patch Set: Update device tests to use correct dict key Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..2288cff45164755c5adc28561b58496a4a222625 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,20 @@ void TimeZoneResolverManager::SetPrimaryUserPrefs(PrefService* pref_service) {
}
bool TimeZoneResolverManager::ShouldSendWiFiGeolocationData() {
+ int timezone_setting = GetTimezoneManagementSetting();
+ return (
+ (timezone_setting ==
+ enterprise_management::SystemTimezoneProto::SEND_WIFI_ACCESS_POINTS) ||
+ (timezone_setting ==
+ enterprise_management::SystemTimezoneProto::SEND_ALL_LOCATION_INFO));
+}
+
+bool TimeZoneResolverManager::ShouldSendCellularGeolocationData() {
+ return (GetTimezoneManagementSetting() ==
+ enterprise_management::SystemTimezoneProto::SEND_ALL_LOCATION_INFO);
+}
+
+int TimeZoneResolverManager::GetTimezoneManagementSetting() {
PrefService* local_state = g_browser_process->local_state();
const bool is_managed = local_state->IsManagedPreference(
prefs::kSystemTimezoneAutomaticDetectionPolicy);
@@ -140,8 +156,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;
}
void TimeZoneResolverManager::UpdateTimezoneResolver() {
« no previous file with comments | « chrome/browser/chromeos/system/timezone_resolver_manager.h ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698