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

Unified Diff: ash/common/wm/overview/window_selector_controller.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/wm/overview/window_selector_controller.cc
diff --git a/ash/common/wm/overview/window_selector_controller.cc b/ash/common/wm/overview/window_selector_controller.cc
index 7dd994d2e4b00c4cbb63d1b746117ada8c698809..9c49e07d539c7aa1d91bc8ab97dccb602a3a3be4 100644
--- a/ash/common/wm/overview/window_selector_controller.cc
+++ b/ash/common/wm/overview/window_selector_controller.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/overview/window_selector.h"
@@ -34,11 +34,10 @@ bool WindowSelectorController::CanSelect() {
// Don't allow a window overview if the screen is locked or a modal dialog is
// open or running in kiosk app session.
WmShell* wm_shell = WmShell::Get();
- SessionStateDelegate* session_state_delegate =
- wm_shell->GetSessionStateDelegate();
+ SessionController* session_controller = wm_shell->session_controller();
SystemTrayDelegate* system_tray_delegate = wm_shell->system_tray_delegate();
- return session_state_delegate->IsActiveUserSessionStarted() &&
- !session_state_delegate->IsScreenLocked() &&
+ return session_controller->IsActiveUserSessionStarted() &&
+ !session_controller->IsScreenLocked() &&
!wm_shell->IsSystemModalWindowOpen() && !wm_shell->IsPinned() &&
system_tray_delegate->GetUserLoginStatus() != LoginStatus::KIOSK_APP &&
system_tray_delegate->GetUserLoginStatus() !=
« no previous file with comments | « ash/common/wm/maximize_mode/maximize_mode_event_handler.cc ('k') | ash/common/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698