| Index: ash/display/screen_position_controller.cc
|
| diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
|
| index e76fdc481930628d920ce04c7f4ab482541ea59e..c0079c877f1d35ab42e496a0386c3b5031e29b8e 100644
|
| --- a/ash/display/screen_position_controller.cc
|
| +++ b/ash/display/screen_position_controller.cc
|
| @@ -40,7 +40,7 @@ void MoveAllTransientChildrenToNewRoot(const gfx::Display& display,
|
| aura::Window* dst_root = Shell::GetInstance()->display_controller()->
|
| GetRootWindowForDisplayId(display.id());
|
| aura::Window::Windows transient_children =
|
| - views::corewm::GetTransientChildren(window);
|
| + ::wm::GetTransientChildren(window);
|
| for (aura::Window::Windows::iterator iter = transient_children.begin();
|
| iter != transient_children.end(); ++iter) {
|
| aura::Window* transient_child = *iter;
|
| @@ -163,7 +163,7 @@ void ScreenPositionController::SetBounds(aura::Window* window,
|
| // b) if the window or its ancestor has kStayInSameRootWindowkey. It's
|
| // intentionally kept in the same root window even if the bounds is
|
| // outside of the display.
|
| - if (!views::corewm::GetTransientParent(window) &&
|
| + if (!::wm::GetTransientParent(window) &&
|
| !ShouldStayInSameRootWindow(window)) {
|
| aura::Window* dst_root =
|
| Shell::GetInstance()->display_controller()->GetRootWindowForDisplayId(
|
|
|