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

Unified Diff: ash/system/palette/palette_tray.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/overview/overview_button_tray.cc ('k') | ash/system/session/logout_confirmation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/palette/palette_tray.cc
diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc
index ab54c99bc80cbd5079af5296f0ed191b8a1012a2..c118983073f7e84f6016de9b60d16bfce9ee9faf 100644
--- a/ash/system/palette/palette_tray.cc
+++ b/ash/system/palette/palette_tray.cc
@@ -17,7 +17,6 @@
#include "ash/system/palette/palette_utils.h"
#include "ash/system/tray/system_menu_button.h"
#include "ash/system/tray/system_tray_controller.h"
-#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/tray_bubble_wrapper.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_container.h"
@@ -65,8 +64,7 @@ bool IsInUserSession() {
return !session_controller->IsUserSessionBlocked() &&
session_controller->GetSessionState() ==
session_manager::SessionState::ACTIVE &&
- Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
- LoginStatus::KIOSK_APP;
+ !session_controller->IsKioskSession();
}
class TitleView : public views::View, public views::ButtonListener {
« no previous file with comments | « ash/system/overview/overview_button_tray.cc ('k') | ash/system/session/logout_confirmation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698