| Index: ash/wm/workspace/workspace_window_resizer.cc
|
| diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
|
| index 9d64fb2bca5a6da4d6a8aad980bbfc33d32c03e9..eea0811e770c305a9491d64e994dbfb59fd1b994 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer.cc
|
| +++ b/ash/wm/workspace/workspace_window_resizer.cc
|
| @@ -36,6 +36,7 @@
|
| #include "ui/compositor/layer.h"
|
| #include "ui/gfx/screen.h"
|
| #include "ui/gfx/transform.h"
|
| +#include "ui/views/corewm/window_util.h"
|
| #include "ui/wm/public/window_types.h"
|
|
|
| namespace ash {
|
| @@ -97,7 +98,7 @@ scoped_ptr<WindowResizer> CreateWindowResizer(
|
| }
|
| if (switches::UseDockedWindows() &&
|
| window_resizer && window->parent() &&
|
| - !window->transient_parent() &&
|
| + !views::corewm::GetTransientParent(window) &&
|
| (window->parent()->id() == internal::kShellWindowId_DefaultContainer ||
|
| window->parent()->id() == internal::kShellWindowId_DockedContainer ||
|
| window->parent()->id() == internal::kShellWindowId_PanelContainer)) {
|
|
|