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

Unified Diff: ash/common/test/test_session_state_delegate.cc

Issue 2573703003: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: msw comments Created 4 years 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/common/shelf/shelf_widget.cc ('k') | ash/common/wm_root_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/test/test_session_state_delegate.cc
diff --git a/ash/common/test/test_session_state_delegate.cc b/ash/common/test/test_session_state_delegate.cc
index 28b60f3ce53f666974d539b3bbbdb557fce8fef4..9132b8ce13f8d5883f10111ba7172d570a4fb57a 100644
--- a/ash/common/test/test_session_state_delegate.cc
+++ b/ash/common/test/test_session_state_delegate.cc
@@ -161,12 +161,9 @@ session_manager::SessionState TestSessionStateDelegate::GetSessionState()
}
void TestSessionStateDelegate::SetHasActiveUser(bool has_active_user) {
- if (!has_active_user) {
- session_state_ = session_manager::SessionState::LOGIN_PRIMARY;
- } else {
- session_state_ = session_manager::SessionState::ACTIVE;
- WmShell::Get()->ShowShelf();
- }
+ session_state_ = has_active_user
+ ? session_manager::SessionState::ACTIVE
+ : session_manager::SessionState::LOGIN_PRIMARY;
}
void TestSessionStateDelegate::SetActiveUserSessionStarted(
« no previous file with comments | « ash/common/shelf/shelf_widget.cc ('k') | ash/common/wm_root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698