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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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/wm/overview/window_selector_controller.cc
diff --git a/ash/wm/overview/window_selector_controller.cc b/ash/wm/overview/window_selector_controller.cc
index 0b1fb878092d0b8628f095cf32641b6d8df55bb0..86057fd240fd5dd67520acfe23b889f40228c0c4 100644
--- a/ash/wm/overview/window_selector_controller.cc
+++ b/ash/wm/overview/window_selector_controller.cc
@@ -8,12 +8,12 @@
#include "ash/session/session_controller.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/overview/window_selector.h"
#include "ash/wm/screen_pinning_controller.h"
#include "ash/wm/window_state.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/metrics/histogram_macros.h"
@@ -39,7 +39,7 @@ bool WindowSelectorController::CanSelect() {
Shell::Get()->system_tray_delegate();
return session_controller->IsActiveUserSessionStarted() &&
!session_controller->IsScreenLocked() &&
- !WmShell::Get()->IsSystemModalWindowOpen() &&
+ !ShellPort::Get()->IsSystemModalWindowOpen() &&
!Shell::Get()->screen_pinning_controller()->IsPinned() &&
system_tray_delegate->GetUserLoginStatus() != LoginStatus::KIOSK_APP &&
system_tray_delegate->GetUserLoginStatus() !=

Powered by Google App Engine
This is Rietveld 408576698