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

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

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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/common/test/test_session_state_delegate.cc ('k') | ash/common/wallpaper/wallpaper_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/test/test_system_tray_delegate.cc
diff --git a/ash/common/test/test_system_tray_delegate.cc b/ash/common/test/test_system_tray_delegate.cc
index 84b240c335d27d85ec3bd8857ea224ab6d6c6041..c6d3226f0bf3356f50f97a6c4a7227b8ee8bf053 100644
--- a/ash/common/test/test_system_tray_delegate.cc
+++ b/ash/common/test/test_system_tray_delegate.cc
@@ -7,7 +7,7 @@
#include <string>
#include "ash/common/login_status.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/wm_shell.h"
#include "base/time/time.h"
@@ -57,11 +57,11 @@ 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().
- SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
+ SessionController* controller = WmShell::Get()->session_controller();
- if (!delegate->IsActiveUserSessionStarted())
+ if (!controller->IsActiveUserSessionStarted())
return LoginStatus::NOT_LOGGED_IN;
- if (delegate->IsScreenLocked())
+ if (controller->IsScreenLocked())
return LoginStatus::LOCKED;
return login_status_;
}
« no previous file with comments | « ash/common/test/test_session_state_delegate.cc ('k') | ash/common/wallpaper/wallpaper_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698