| Index: ash/common/wm/window_positioning_utils.cc
|
| diff --git a/ash/common/wm/window_positioning_utils.cc b/ash/common/wm/window_positioning_utils.cc
|
| index 075090e397681eff224815a6394474c03ea5462f..babed2f4456c1c9a052f946f5299ca5d6441a038 100644
|
| --- a/ash/common/wm/window_positioning_utils.cc
|
| +++ b/ash/common/wm/window_positioning_utils.cc
|
| @@ -10,10 +10,10 @@
|
| #include "ash/common/wm/window_state.h"
|
| #include "ash/common/wm/wm_event.h"
|
| #include "ash/common/wm/wm_screen_util.h"
|
| -#include "ash/common/wm_lookup.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| #include "ash/root_window_controller.h"
|
| +#include "ash/shell.h"
|
| #include "ui/aura/window_tracker.h"
|
| #include "ui/display/display.h"
|
| #include "ui/display/types/display_constants.h"
|
| @@ -47,9 +47,8 @@ bool IsWindowOrAncestorLockedToRoot(const WmWindow* window) {
|
| // the child windows and transient children of the transient children.
|
| void MoveAllTransientChildrenToNewRoot(const display::Display& display,
|
| WmWindow* window) {
|
| - WmWindow* dst_root = WmLookup::Get()
|
| - ->GetRootWindowControllerWithDisplayId(display.id())
|
| - ->GetWindow();
|
| + WmWindow* dst_root =
|
| + Shell::GetRootWindowControllerWithDisplayId(display.id())->GetWindow();
|
| for (WmWindow* transient_child : window->GetTransientChildren()) {
|
| const int container_id = transient_child->GetParent()->GetShellWindowId();
|
| DCHECK_GE(container_id, 0);
|
| @@ -139,7 +138,7 @@ void SetBoundsInScreen(WmWindow* window,
|
| if (!window->GetTransientParent() &&
|
| !IsWindowOrAncestorLockedToRoot(window)) {
|
| RootWindowController* dst_root_window_controller =
|
| - WmLookup::Get()->GetRootWindowControllerWithDisplayId(display.id());
|
| + Shell::GetRootWindowControllerWithDisplayId(display.id());
|
| DCHECK(dst_root_window_controller);
|
| WmWindow* dst_root = dst_root_window_controller->GetWindow();
|
| DCHECK(dst_root);
|
|
|