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

Unified Diff: ash/common/wm/container_finder.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
« no previous file with comments | « ash/common/wallpaper/wallpaper_view.cc ('k') | ash/common/wm/maximize_mode/maximize_mode_event_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/container_finder.cc
diff --git a/ash/common/wm/container_finder.cc b/ash/common/wm/container_finder.cc
index 95207ec36931a2c615ba6555ee1a3292ab13685f..f55f29c9bcd7d5bed5d1b422f343f53065b68e90 100644
--- a/ash/common/wm/container_finder.cc
+++ b/ash/common/wm/container_finder.cc
@@ -4,7 +4,7 @@
#include "ash/common/wm/container_finder.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/wm/always_on_top_controller.h"
#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm/window_state.h"
@@ -39,7 +39,7 @@ WmWindow* GetSystemModalContainer(WmWindow* root, WmWindow* window) {
// all modal windows are placed into the normal modal container.
// In case of missing transient parent (it could happen for alerts from
// background pages) assume that the window belongs to user session.
- if (!window->GetShell()->GetSessionStateDelegate()->IsUserSessionBlocked() ||
+ if (!WmShell::Get()->session_controller()->IsUserSessionBlocked() ||
!window->GetTransientParent()) {
return root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
}
« no previous file with comments | « ash/common/wallpaper/wallpaper_view.cc ('k') | ash/common/wm/maximize_mode/maximize_mode_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698