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

Unified Diff: ash/common/wm/window_cycle_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/window_cycle_controller.cc
diff --git a/ash/common/wm/window_cycle_controller.cc b/ash/common/wm/window_cycle_controller.cc
index 686290e54064664a3af0ddb3f256598b5223de62..1eaa79026114b86c9229d71ec65afdec99b91218 100644
--- a/ash/common/wm/window_cycle_controller.cc
+++ b/ash/common/wm/window_cycle_controller.cc
@@ -5,7 +5,7 @@
#include "ash/common/wm/window_cycle_controller.h"
#include "ash/common/metrics/task_switch_source.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/window_cycle_event_filter.h"
#include "ash/common/wm/window_cycle_list.h"
@@ -38,7 +38,7 @@ WindowCycleController::~WindowCycleController() {}
bool WindowCycleController::CanCycle() {
// Prevent window cycling if the screen is locked or a modal dialog is open.
WmShell* wm_shell = WmShell::Get();
- return !wm_shell->GetSessionStateDelegate()->IsScreenLocked() &&
+ return !wm_shell->session_controller()->IsScreenLocked() &&
!wm_shell->IsSystemModalWindowOpen() && !wm_shell->IsPinned();
}
« no previous file with comments | « ash/common/wm/system_modal_container_layout_manager.cc ('k') | ash/common/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698