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

Unified Diff: ash/common/wm/container_finder.cc

Issue 2041233004: mash: Move //ash/session to //ash/common/session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/session/session_types.h ('k') | ash/common/wm/workspace/workspace_layout_manager.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 5b19b033c88a3817e42c8d675246f6f204abf24c..6eb05a38a211beb68dfd1ecafc2932749f1e00c2 100644
--- a/ash/common/wm/container_finder.cc
+++ b/ash/common/wm/container_finder.cc
@@ -4,6 +4,7 @@
#include "ash/common/wm/container_finder.h"
+#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_window_ids.h"
#include "ash/common/wm/always_on_top_controller.h"
#include "ash/common/wm/root_window_finder.h"
@@ -35,7 +36,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()->IsUserSessionBlocked() ||
+ if (!window->GetShell()->GetSessionStateDelegate()->IsUserSessionBlocked() ||
!window->GetTransientParent()) {
return root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
}
« no previous file with comments | « ash/common/session/session_types.h ('k') | ash/common/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698