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

Unified Diff: ash/common/system/overview/overview_button_tray.cc

Issue 2416253004: ash: Use session_manager::SessionState (Closed)
Patch Set: fix compile Created 4 years, 2 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/overview/overview_button_tray.cc
diff --git a/ash/common/system/overview/overview_button_tray.cc b/ash/common/system/overview/overview_button_tray.cc
index 672798967666d5cc1d5ad27d7c20619bf4809387..c6fcc3abcbf0efb125ad45e5501d48c0d2451b94 100644
--- a/ash/common/system/overview/overview_button_tray.cc
+++ b/ash/common/system/overview/overview_button_tray.cc
@@ -77,8 +77,7 @@ bool OverviewButtonTray::PerformAction(const ui::Event& event) {
return true;
}
-void OverviewButtonTray::SessionStateChanged(
- SessionStateDelegate::SessionState state) {
+void OverviewButtonTray::SessionStateChanged(SessionState state) {
UpdateIconVisibility();
}
@@ -144,8 +143,7 @@ void OverviewButtonTray::UpdateIconVisibility() {
shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
session_state_delegate->IsActiveUserSessionStarted() &&
!session_state_delegate->IsScreenLocked() &&
- session_state_delegate->GetSessionState() ==
- SessionStateDelegate::SESSION_STATE_ACTIVE &&
+ session_state_delegate->GetSessionState() == SessionState::ACTIVE &&
shell->system_tray_delegate()->GetUserLoginStatus() !=
LoginStatus::KIOSK_APP);
}

Powered by Google App Engine
This is Rietveld 408576698