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

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

Issue 2942043002: cros: Tighten profile loading (Closed)
Patch Set: update SystemClock header 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/system/system_clock.cc
diff --git a/chrome/browser/chromeos/system/system_clock.cc b/chrome/browser/chromeos/system/system_clock.cc
index 3c921661529b0b3cb1f431f1f765a78b33eb094f..7aa0bcc35c21f0923882a56fb59d6dede480e35f 100644
--- a/chrome/browser/chromeos/system/system_clock.cc
+++ b/chrome/browser/chromeos/system/system_clock.cc
@@ -122,8 +122,9 @@ void SystemClock::Observe(int type,
}
}
-void SystemClock::ActiveUserChanged(const user_manager::User* /*user*/) {
- UpdateClockType();
+void SystemClock::ActiveUserChanged(const user_manager::User* active_user) {
+ if (active_user && active_user->is_profile_created())
+ UpdateClockType();
}
void SystemClock::AddObserver(SystemClockObserver* observer) {
@@ -142,6 +143,7 @@ void SystemClock::OnActiveProfileChanged(Profile* profile) {
user_pref_registrar_->Add(
prefs::kUse24HourClock,
base::Bind(&SystemClock::UpdateClockType, base::Unretained(this)));
+ UpdateClockType();
}
bool SystemClock::OnProfileDestroyed(Profile* profile) {
« no previous file with comments | « chrome/browser/chromeos/system/system_clock.h ('k') | chrome/browser/chromeos/system/tray_accessibility_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698