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

Unified Diff: ash/common/system/chromeos/palette/palette_tray.cc

Issue 2416253004: ash: Use session_manager::SessionState (Closed)
Patch Set: add comment about session state in SessionStaetDelegateChromeos 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/chromeos/palette/palette_tray.cc
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc
index 4ffe589e3606221e6606969aaf891e0d9e42f8ac..31fa8ec3e2b8a60592f0fcc817d0a0d3b6417584 100644
--- a/ash/common/system/chromeos/palette/palette_tray.cc
+++ b/ash/common/system/chromeos/palette/palette_tray.cc
@@ -4,6 +4,7 @@
#include "ash/common/system/chromeos/palette/palette_tray.h"
+#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/shelf_constants.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shelf/wm_shelf_util.h"
@@ -76,7 +77,7 @@ bool IsInUserSession() {
WmShell::Get()->GetSessionStateDelegate();
return !session_state_delegate->IsUserSessionBlocked() &&
session_state_delegate->GetSessionState() ==
- SessionStateDelegate::SESSION_STATE_ACTIVE &&
+ session_manager::SessionState::ACTIVE &&
WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
LoginStatus::KIOSK_APP;
}
@@ -269,8 +270,7 @@ bool PaletteTray::ContainsPointInScreen(const gfx::Point& point) {
return bubble_ && bubble_->bubble_view()->GetBoundsInScreen().Contains(point);
}
-void PaletteTray::SessionStateChanged(
- SessionStateDelegate::SessionState state) {
+void PaletteTray::SessionStateChanged(session_manager::SessionState state) {
UpdateIconVisibility();
}
« no previous file with comments | « ash/common/system/chromeos/palette/palette_tray.h ('k') | ash/common/system/overview/overview_button_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698