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

Unified Diff: ash/common/wm/overview/window_selector_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/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 fa00733c6e5c5c9266bf51d0ce9b8ff8b4167117..6769442fe44a379ea64efa1d0d45bbd6ce2a3476 100644
--- a/ash/common/wm/overview/window_selector_controller.cc
+++ b/ash/common/wm/overview/window_selector_controller.cc
@@ -33,10 +33,10 @@ WindowSelectorController::~WindowSelectorController() {
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();
- SessionController* session_controller = wm_shell->session_controller();
+ SessionController* session_controller = Shell::Get()->session_controller();
SystemTrayDelegate* system_tray_delegate =
Shell::Get()->system_tray_delegate();
+ WmShell* wm_shell = WmShell::Get();
return session_controller->IsActiveUserSessionStarted() &&
!session_controller->IsScreenLocked() &&
!wm_shell->IsSystemModalWindowOpen() && !wm_shell->IsPinned() &&
« 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