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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h" | 55 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h" |
56 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 56 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
57 #include "chrome/browser/chromeos/login/startup_utils.h" | 57 #include "chrome/browser/chromeos/login/startup_utils.h" |
58 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre
en.h" | 58 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre
en.h" |
59 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 59 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
60 #include "chrome/browser/chromeos/net/delay_network_call.h" | 60 #include "chrome/browser/chromeos/net/delay_network_call.h" |
61 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 61 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
62 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 62 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
63 #include "chrome/browser/chromeos/settings/cros_settings.h" | 63 #include "chrome/browser/chromeos/settings/cros_settings.h" |
64 #include "chrome/browser/chromeos/system/device_disabling_manager.h" | 64 #include "chrome/browser/chromeos/system/device_disabling_manager.h" |
| 65 #include "chrome/browser/chromeos/system/timezone_util.h" |
65 #include "chrome/browser/lifetime/application_lifetime.h" | 66 #include "chrome/browser/lifetime/application_lifetime.h" |
66 #include "chrome/browser/metrics/metrics_reporting_state.h" | 67 #include "chrome/browser/metrics/metrics_reporting_state.h" |
67 #include "chrome/browser/profiles/profile.h" | 68 #include "chrome/browser/profiles/profile.h" |
68 #include "chrome/browser/profiles/profile_manager.h" | 69 #include "chrome/browser/profiles/profile_manager.h" |
69 #include "chrome/browser/ui/ash/ash_util.h" | 70 #include "chrome/browser/ui/ash/ash_util.h" |
70 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" | 71 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
71 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 72 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
72 #include "chrome/browser/ui/webui/help/help_utils_chromeos.h" | 73 #include "chrome/browser/ui/webui/help/help_utils_chromeos.h" |
73 #include "chrome/common/chrome_constants.h" | 74 #include "chrome/common/chrome_constants.h" |
74 #include "chrome/common/pref_names.h" | 75 #include "chrome/common/pref_names.h" |
(...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1420 !policy_timezone.empty()) { | 1421 !policy_timezone.empty()) { |
1421 VLOG(1) << "Resolve TimeZone: TimeZone settings are overridden" | 1422 VLOG(1) << "Resolve TimeZone: TimeZone settings are overridden" |
1422 << " by DevicePolicy."; | 1423 << " by DevicePolicy."; |
1423 return; | 1424 return; |
1424 } | 1425 } |
1425 } | 1426 } |
1426 | 1427 |
1427 if (!timezone->timeZoneId.empty()) { | 1428 if (!timezone->timeZoneId.empty()) { |
1428 VLOG(1) << "Resolve TimeZone: setting timezone to '" << timezone->timeZoneId | 1429 VLOG(1) << "Resolve TimeZone: setting timezone to '" << timezone->timeZoneId |
1429 << "'"; | 1430 << "'"; |
1430 | 1431 chromeos::system::SetSigninScreenTimezone(timezone->timeZoneId, |
1431 system::TimezoneSettings::GetInstance()->SetTimezoneFromID( | 1432 true /* set_system_timezone */); |
1432 base::UTF8ToUTF16(timezone->timeZoneId)); | |
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 |