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

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

Issue 2727593002: ChromeOS timezone detection: CfM devices default to static timezone. (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2288cff45164755c5adc28561b58496a4a222625..d1e9ef35872830939883ab791eac6e1e04094786 100644
--- a/chrome/browser/chromeos/system/timezone_resolver_manager.cc
+++ b/chrome/browser/chromeos/system/timezone_resolver_manager.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
#include "chrome/browser/chromeos/preferences.h"
+#include "chrome/browser/chromeos/system/input_device_settings.h"
#include "chrome/browser/chromeos/system/timezone_util.h"
#include "chrome/common/pref_names.h"
#include "chromeos/chromeos_switches.h"
@@ -99,7 +100,10 @@ ServiceConfiguration GetServiceConfigurationFromUserPrefs(
ServiceConfiguration GetServiceConfigurationForSigninScreen() {
if (!g_browser_process->local_state()->GetBoolean(
prefs::kResolveDeviceTimezoneByGeolocation)) {
- return SHOULD_START;
+ // CfM devices default to static timezone.
+ bool keyboard_driven_oobe =
+ system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
+ return keyboard_driven_oobe ? SHOULD_STOP : SHOULD_START;
}
// Do not start resolver if we are inside active user session.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698