| 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 {
|
|
|