OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/wizard_controller.h" | 5 #include "chrome/browser/chromeos/login/wizard_controller.h" |
6 | 6 |
7 #include <signal.h> | 7 #include <signal.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdlib.h> | 9 #include <stdlib.h> |
10 #include <sys/types.h> | 10 #include <sys/types.h> |
(...skipping 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1420 !policy_timezone.empty()) { | 1420 !policy_timezone.empty()) { |
1421 VLOG(1) << "Resolve TimeZone: TimeZone settings are overridden" | 1421 VLOG(1) << "Resolve TimeZone: TimeZone settings are overridden" |
1422 << " by DevicePolicy."; | 1422 << " by DevicePolicy."; |
1423 return; | 1423 return; |
1424 } | 1424 } |
1425 } | 1425 } |
1426 | 1426 |
1427 if (!timezone->timeZoneId.empty()) { | 1427 if (!timezone->timeZoneId.empty()) { |
1428 VLOG(1) << "Resolve TimeZone: setting timezone to '" << timezone->timeZoneId | 1428 VLOG(1) << "Resolve TimeZone: setting timezone to '" << timezone->timeZoneId |
1429 << "'"; | 1429 << "'"; |
1430 | 1430 g_browser_process->local_state()->SetString(prefs::kSigninScreenTimezone, |
1431 system::TimezoneSettings::GetInstance()->SetTimezoneFromID( | 1431 timezone->timeZoneId); |
1432 base::UTF8ToUTF16(timezone->timeZoneId)); | 1432 CrosSettings::Get()->SetString(kSystemTimezone, timezone->timeZoneId); |
stevenjb
2017/05/15 17:08:02
Setting both of these in multiple places is a litt
Alexander Alekseev
2017/05/16 01:11:56
Done.
| |
1433 } | 1433 } |
1434 } | 1434 } |
1435 | 1435 |
1436 TimeZoneProvider* WizardController::GetTimezoneProvider() { | 1436 TimeZoneProvider* WizardController::GetTimezoneProvider() { |
1437 if (!timezone_provider_) { | 1437 if (!timezone_provider_) { |
1438 timezone_provider_.reset( | 1438 timezone_provider_.reset( |
1439 new TimeZoneProvider(g_browser_process->system_request_context(), | 1439 new TimeZoneProvider(g_browser_process->system_request_context(), |
1440 DefaultTimezoneProviderURL())); | 1440 DefaultTimezoneProviderURL())); |
1441 } | 1441 } |
1442 return timezone_provider_.get(); | 1442 return timezone_provider_.get(); |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1540 SetCurrentScreen(screen); | 1540 SetCurrentScreen(screen); |
1541 } | 1541 } |
1542 | 1542 |
1543 AutoEnrollmentController* WizardController::GetAutoEnrollmentController() { | 1543 AutoEnrollmentController* WizardController::GetAutoEnrollmentController() { |
1544 if (!auto_enrollment_controller_) | 1544 if (!auto_enrollment_controller_) |
1545 auto_enrollment_controller_ = base::MakeUnique<AutoEnrollmentController>(); | 1545 auto_enrollment_controller_ = base::MakeUnique<AutoEnrollmentController>(); |
1546 return auto_enrollment_controller_.get(); | 1546 return auto_enrollment_controller_.get(); |
1547 } | 1547 } |
1548 | 1548 |
1549 } // namespace chromeos | 1549 } // namespace chromeos |
OLD | NEW |