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

Unified Diff: ash/common/wm/overview/window_selector_controller.cc

Issue 2761063002: Move 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
« no previous file with comments | « ash/common/wm/maximize_mode/maximize_mode_event_handler.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9c49e07d539c7aa1d91bc8ab97dccb602a3a3be4..95f6f31f59763cbdf9f89747ae52b9ea9e2cd840 100644
--- a/ash/common/wm/overview/window_selector_controller.cc
+++ b/ash/common/wm/overview/window_selector_controller.cc
@@ -35,7 +35,8 @@ bool WindowSelectorController::CanSelect() {
// open or running in kiosk app session.
WmShell* wm_shell = WmShell::Get();
SessionController* session_controller = wm_shell->session_controller();
- SystemTrayDelegate* system_tray_delegate = wm_shell->system_tray_delegate();
+ SystemTrayDelegate* system_tray_delegate =
+ Shell::Get()->system_tray_delegate();
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_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698