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

Unified Diff: ash/common/wm/window_cycle_controller.cc

Issue 2761373002: Move yet more from WmShell to Shell (Closed)
Patch Set: merge 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 7b6cfe5d5edb6a7ed8c063d5cfda20f6136c7f6c..b3cd51caf66ac34e8d2f1ae92f89ab9bfe36fe77 100644
--- a/ash/common/wm/window_cycle_controller.cc
+++ b/ash/common/wm/window_cycle_controller.cc
@@ -39,7 +39,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->session_controller()->IsScreenLocked() &&
+ return !Shell::Get()->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