Index: ash/mus/top_level_window_factory.cc |
diff --git a/ash/mus/top_level_window_factory.cc b/ash/mus/top_level_window_factory.cc |
index 1c810c124f5af743c32e84861153abb319646c1e..0a921198c97961c73e3c0fe6ccb87806d5fd5fa9 100644 |
--- a/ash/mus/top_level_window_factory.cc |
+++ b/ash/mus/top_level_window_factory.cc |
@@ -131,9 +131,8 @@ aura::Window* CreateAndParentTopLevelWindowInRoot( |
aura::Window* context = nullptr; |
aura::Window* container_window = nullptr; |
if (GetInitialContainerId(*properties, &container_id)) { |
- container_window = root_window_controller->GetWindow() |
- ->GetChildByShellWindowId(container_id) |
- ->aura_window(); |
+ container_window = |
+ root_window_controller->GetRootWindow()->GetChildById(container_id); |
} else { |
context = root_window_controller->GetRootWindow(); |
} |
@@ -160,9 +159,8 @@ aura::Window* CreateAndParentTopLevelWindowInRoot( |
// Pick a parent so display information is obtained. Will pick the real one |
// once transient parent found. |
aura::Window* unparented_control_container = |
- root_window_controller->GetWindow() |
- ->GetChildByShellWindowId(kShellWindowId_UnparentedControlContainer) |
- ->aura_window(); |
+ root_window_controller->GetRootWindow()->GetChildById( |
+ kShellWindowId_UnparentedControlContainer); |
// DetachedTitleAreaRendererForClient is owned by the client. |
DetachedTitleAreaRendererForClient* renderer = |
new DetachedTitleAreaRendererForClient(unparented_control_container, |