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

Unified Diff: ash/common/wm/system_modal_container_layout_manager.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/wm/overview/window_selector_controller.cc ('k') | ash/common/wm/window_cycle_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/system_modal_container_layout_manager.cc
diff --git a/ash/common/wm/system_modal_container_layout_manager.cc b/ash/common/wm/system_modal_container_layout_manager.cc
index 2f21230de32bc0acd449fd0bdba732aacbf787ea..220a4d4a4cc7e27776e608b54fa676374b6b9149 100644
--- a/ash/common/wm/system_modal_container_layout_manager.cc
+++ b/ash/common/wm/system_modal_container_layout_manager.cc
@@ -6,7 +6,7 @@
#include <cmath>
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/wm/window_dimmer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
@@ -80,7 +80,7 @@ void SystemModalContainerLayoutManager::OnWindowAddedToLayout(WmWindow* child) {
if (!WmShell::Get()->IsRunningInMash()) {
DCHECK(container_->GetShellWindowId() !=
kShellWindowId_LockSystemModalContainer ||
- WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked());
+ WmShell::Get()->session_controller()->IsUserSessionBlocked());
}
// Since this is for SystemModal, there is no good reason to add windows
// other than MODAL_TYPE_NONE or MODAL_TYPE_SYSTEM. DCHECK to avoid simple
« no previous file with comments | « ash/common/wm/overview/window_selector_controller.cc ('k') | ash/common/wm/window_cycle_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698