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

Unified Diff: ash/test/test_system_tray_delegate.cc

Issue 2826313002: cros: Use SessionController in UserMetricsRecorder to get login status (Closed)
Patch Set: review comments Created 3 years, 8 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
« no previous file with comments | « ash/test/test_system_tray_delegate.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_system_tray_delegate.cc
diff --git a/ash/test/test_system_tray_delegate.cc b/ash/test/test_system_tray_delegate.cc
index 41fc0fd38456ec474ba9472a296440c83abaf522..0f19c35cdb4164adb2977442bb577038d00d5737 100644
--- a/ash/test/test_system_tray_delegate.cc
+++ b/ash/test/test_system_tray_delegate.cc
@@ -14,15 +14,9 @@
namespace ash {
namespace test {
-TestSystemTrayDelegate::TestSystemTrayDelegate()
- : login_status_(LoginStatus::USER), session_length_limit_set_(false) {}
+TestSystemTrayDelegate::TestSystemTrayDelegate() = default;
-TestSystemTrayDelegate::~TestSystemTrayDelegate() {}
-
-void TestSystemTrayDelegate::SetLoginStatus(LoginStatus login_status) {
- login_status_ = login_status;
- Shell::Get()->UpdateAfterLoginStatusChange(login_status);
-}
+TestSystemTrayDelegate::~TestSystemTrayDelegate() = default;
void TestSystemTrayDelegate::SetSessionLengthLimitForTest(
const base::TimeDelta& new_limit) {
@@ -43,15 +37,7 @@ void TestSystemTrayDelegate::SetAvailableIMEList(const IMEInfoList& list) {
}
LoginStatus TestSystemTrayDelegate::GetUserLoginStatus() const {
- // At new user image screen manager->IsUserLoggedIn() would return true
- // but there's no browser session available yet so use SessionStarted().
- SessionController* controller = Shell::Get()->session_controller();
-
- if (!controller->IsActiveUserSessionStarted())
- return LoginStatus::NOT_LOGGED_IN;
- if (controller->IsScreenLocked())
- return LoginStatus::LOCKED;
- return login_status_;
+ return Shell::Get()->session_controller()->login_status();
}
std::string TestSystemTrayDelegate::GetSupervisedUserManager() const {
« no previous file with comments | « ash/test/test_system_tray_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698