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

Unified Diff: ash/system/session/logout_confirmation_controller.cc

Issue 2864663002: cros: Merge SystemTrayDelegate::GetUserLoginStatus (Closed)
Patch Set: update PaletteTray to exclude ARC kiosk Created 3 years, 7 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/system/palette/palette_tray.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/session/logout_confirmation_controller.cc
diff --git a/ash/system/session/logout_confirmation_controller.cc b/ash/system/session/logout_confirmation_controller.cc
index d3b29cf5d72fc138176a9c4a73a4f22b1ca2851a..7fab21d81880fd8e6ad2f5d07e70bb758615acda 100644
--- a/ash/system/session/logout_confirmation_controller.cc
+++ b/ash/system/session/logout_confirmation_controller.cc
@@ -10,7 +10,6 @@
#include "ash/session/session_controller.h"
#include "ash/shell.h"
#include "ash/system/session/logout_confirmation_dialog.h"
-#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "base/location.h"
#include "base/time/default_tick_clock.h"
@@ -91,7 +90,7 @@ void LogoutConfirmationController::OnDialogClosed() {
}
void LogoutConfirmationController::OnLastWindowClosed() {
- if (Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
+ if (Shell::Get()->session_controller()->login_status() !=
LoginStatus::PUBLIC) {
return;
}
« no previous file with comments | « ash/system/palette/palette_tray.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698