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

Unified Diff: ash/common/system/date/date_default_view.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
Index: ash/common/system/date/date_default_view.cc
diff --git a/ash/common/system/date/date_default_view.cc b/ash/common/system/date/date_default_view.cc
index c54d7b8617046664be1df485bff56c8ddf944b1c..664dc7847e70b49dd1d677121f953d7205d7c588 100644
--- a/ash/common/system/date/date_default_view.cc
+++ b/ash/common/system/date/date_default_view.cc
@@ -5,7 +5,7 @@
#include "ash/common/system/date/date_default_view.h"
#include "ash/common/metrics/user_metrics_action.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/shutdown_controller.h"
#include "ash/common/system/date/date_view.h"
#include "ash/common/system/tray/special_popup_row.h"
@@ -55,7 +55,7 @@ DateDefaultView::DateDefaultView(SystemTrayItem* owner, LoginStatus login)
WmShell* shell = WmShell::Get();
const bool adding_user =
- shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
+ shell->session_controller()->IsInSecondaryLoginScreen();
if (login == LoginStatus::LOCKED || login == LoginStatus::NOT_LOGGED_IN ||
adding_user)
@@ -94,7 +94,7 @@ DateDefaultView::DateDefaultView(SystemTrayItem* owner, LoginStatus login)
reboot ? IDS_ASH_STATUS_TRAY_REBOOT : IDS_ASH_STATUS_TRAY_SHUTDOWN));
}
- if (shell->GetSessionStateDelegate()->CanLockScreen()) {
+ if (shell->session_controller()->CanLockScreen()) {
lock_button_ = new TrayPopupHeaderButton(
this, IDR_AURA_UBER_TRAY_LOCKSCREEN, IDR_AURA_UBER_TRAY_LOCKSCREEN,
IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER,
« no previous file with comments | « ash/common/system/chromeos/settings/tray_settings.cc ('k') | ash/common/system/overview/overview_button_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698