| Index: ash/wm/container_finder.cc
|
| diff --git a/ash/wm/container_finder.cc b/ash/wm/container_finder.cc
|
| index e5cb9aabf492b5e5ce90fb5f6a64708209b5a768..ea9bd895026396b5b40ba9fba78fe57b2514e4d0 100644
|
| --- a/ash/wm/container_finder.cc
|
| +++ b/ash/wm/container_finder.cc
|
| @@ -12,7 +12,6 @@
|
| #include "ash/wm/always_on_top_controller.h"
|
| #include "ash/wm/root_window_finder.h"
|
| #include "ash/wm/window_state.h"
|
| -#include "ash/wm_window.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| @@ -25,8 +24,7 @@ namespace {
|
| aura::Window* FindContainerRoot(const gfx::Rect& bounds) {
|
| if (bounds == gfx::Rect())
|
| return Shell::GetRootWindowForNewWindows();
|
| - WmWindow* root = GetRootWindowMatching(bounds);
|
| - return root ? root->aura_window() : nullptr;
|
| + return GetRootWindowMatching(bounds);
|
| }
|
|
|
| bool HasTransientParentWindow(const aura::Window* window) {
|
|
|