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

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

Issue 24072006: Return correct window when user is logged in but before session is started. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit test compile error Created 7 years, 3 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/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index c3fe71f26358a98dd765ca2da0146368fa14e05d..0dd0529d0646f3c50dc4dca803ebc3ebc69db5f7 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -471,7 +471,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE {
// Map ChromeOS specific LOGGED_IN states to Ash LOGGED_IN states.
LoginState::LoggedInState state = LoginState::Get()->GetLoggedInState();
- if (state == LoginState::LOGGED_IN_OOBE ||
+ if (!LoginState::Get()->IsSessionStarted() ||
+ state == LoginState::LOGGED_IN_OOBE ||
state == LoginState::LOGGED_IN_NONE) {
return ash::user::LOGGED_IN_NONE;
}

Powered by Google App Engine
This is Rietveld 408576698