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 40088a42d81693cb5e683faaf2b56f7ffb1f3052..0a648a025f748303a10c7c27d0f6a78dfeedee28 100644 |
--- a/ash/wm/dock/docked_window_layout_manager.cc |
+++ b/ash/wm/dock/docked_window_layout_manager.cc |
@@ -37,6 +37,7 @@ |
#include "ui/gfx/image/image_skia_operations.h" |
#include "ui/gfx/rect.h" |
#include "ui/views/background.h" |
+#include "ui/views/corewm/window_util.h" |
namespace ash { |
namespace internal { |
@@ -189,7 +190,7 @@ namespace { |
// Returns true if a window is a popup or a transient child. |
bool IsPopupOrTransient(const aura::Window* window) { |
return (window->type() == ui::wm::WINDOW_TYPE_POPUP || |
- window->transient_parent()); |
+ views::corewm::GetTransientParent(window)); |
} |
// Certain windows (minimized, hidden or popups) do not matter to docking. |