| Index: ash/wm/dock/docked_window_layout_manager.cc
|
| diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc
|
| index 3298f05602fceab57d553833909fe8408ee21718..3bac9729f9a7bd4744cbffcd94b28a137472dca7 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager.cc
|
| +++ b/ash/wm/dock/docked_window_layout_manager.cc
|
| @@ -36,6 +36,7 @@
|
| #include "ui/gfx/image/image_skia_operations.h"
|
| #include "ui/gfx/rect.h"
|
| #include "ui/views/background.h"
|
| +#include "ui/views/corewm/transient_window_manager.h"
|
|
|
| namespace ash {
|
| namespace internal {
|
| @@ -181,7 +182,7 @@ namespace {
|
| // Returns true if a window is a popup or a transient child.
|
| bool IsPopupOrTransient(const aura::Window* window) {
|
| return (window->type() == aura::client::WINDOW_TYPE_POPUP ||
|
| - window->transient_parent());
|
| + views::corewm::GetTransientParent(window));
|
| }
|
|
|
| // Certain windows (minimized, hidden or popups) do not matter to docking.
|
|
|