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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 2849823003: ChromeOS: implement per-user time zone preferences. (Closed)
Patch Set: Moved more code to previous CL. Created 3 years, 6 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 unified diff | Download patch
OLDNEW
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
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 1353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 !policy_timezone.empty()) { 1429 !policy_timezone.empty()) {
1429 VLOG(1) << "Resolve TimeZone: TimeZone settings are overridden" 1430 VLOG(1) << "Resolve TimeZone: TimeZone settings are overridden"
1430 << " by DevicePolicy."; 1431 << " by DevicePolicy.";
1431 return; 1432 return;
1432 } 1433 }
1433 } 1434 }
1434 1435
1435 if (!timezone->timeZoneId.empty()) { 1436 if (!timezone->timeZoneId.empty()) {
1436 VLOG(1) << "Resolve TimeZone: setting timezone to '" << timezone->timeZoneId 1437 VLOG(1) << "Resolve TimeZone: setting timezone to '" << timezone->timeZoneId
1437 << "'"; 1438 << "'";
1438 1439 chromeos::system::SetSystemAndSigninScreenTimezone(timezone->timeZoneId);
1439 system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
1440 base::UTF8ToUTF16(timezone->timeZoneId));
1441 } 1440 }
1442 } 1441 }
1443 1442
1444 TimeZoneProvider* WizardController::GetTimezoneProvider() { 1443 TimeZoneProvider* WizardController::GetTimezoneProvider() {
1445 if (!timezone_provider_) { 1444 if (!timezone_provider_) {
1446 timezone_provider_.reset( 1445 timezone_provider_.reset(
1447 new TimeZoneProvider(g_browser_process->system_request_context(), 1446 new TimeZoneProvider(g_browser_process->system_request_context(),
1448 DefaultTimezoneProviderURL())); 1447 DefaultTimezoneProviderURL()));
1449 } 1448 }
1450 return timezone_provider_.get(); 1449 return timezone_provider_.get();
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
1548 SetCurrentScreen(screen); 1547 SetCurrentScreen(screen);
1549 } 1548 }
1550 1549
1551 AutoEnrollmentController* WizardController::GetAutoEnrollmentController() { 1550 AutoEnrollmentController* WizardController::GetAutoEnrollmentController() {
1552 if (!auto_enrollment_controller_) 1551 if (!auto_enrollment_controller_)
1553 auto_enrollment_controller_ = base::MakeUnique<AutoEnrollmentController>(); 1552 auto_enrollment_controller_ = base::MakeUnique<AutoEnrollmentController>();
1554 return auto_enrollment_controller_.get(); 1553 return auto_enrollment_controller_.get();
1555 } 1554 }
1556 1555
1557 } // namespace chromeos 1556 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698