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

Unified Diff: ash/root_window_controller.cc

Issue 2826453003: Makes functions in container_finder take aura::Window (Closed)
Patch Set: cleanup 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
« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index aceb53403905c9d293c7da2011ef2c1c9f10a3f2..816933b25811f265f2fbdfcd9c7a3f8f0a88b28e 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -389,9 +389,10 @@ SystemModalContainerLayoutManager*
RootWindowController::GetSystemModalLayoutManager(WmWindow* window) {
WmWindow* modal_container = nullptr;
if (window) {
- WmWindow* window_container = wm::GetContainerForWindow(window);
- if (window_container && window_container->aura_window()->id() >=
- kShellWindowId_LockScreenContainer) {
+ aura::Window* window_container =
+ wm::GetContainerForWindow(window->aura_window());
+ if (window_container &&
+ window_container->id() >= kShellWindowId_LockScreenContainer) {
modal_container = GetWmContainer(kShellWindowId_LockSystemModalContainer);
} else {
modal_container = GetWmContainer(kShellWindowId_SystemModalContainer);
« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698