Index: ash/wm/panels/panel_layout_manager.cc |
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc |
index cf75c29e32d763e6e79cf91995827b1de1aa99ef..26b845a0eb884e5a3fd4a78f8287d8b73fc334c7 100644 |
--- a/ash/wm/panels/panel_layout_manager.cc |
+++ b/ash/wm/panels/panel_layout_manager.cc |
@@ -25,6 +25,7 @@ |
#include "third_party/skia/include/core/SkPath.h" |
#include "ui/aura/client/activation_client.h" |
#include "ui/aura/client/focus_client.h" |
+#include "ui/aura/client/window_tree_client.h" |
#include "ui/aura/root_window.h" |
#include "ui/aura/window.h" |
#include "ui/compositor/scoped_layer_animation_settings.h" |
@@ -354,9 +355,8 @@ void PanelLayoutManager::OnWindowAddedToLayout(aura::Window* child) { |
// back to appropriate container and ignore it. |
// TODO(varkha): Updating bounds during a drag can cause problems and a more |
// general solution is needed. See http://crbug.com/251813 . |
- child->SetDefaultParentByRootWindow( |
- child->GetRootWindow(), |
- child->GetRootWindow()->GetBoundsInScreen()); |
+ aura::client::ParentWindowWithContext( |
+ child, child, child->GetRootWindow()->GetBoundsInScreen()); |
wm::ReparentTransientChildrenOfChild(child->parent(), child); |
DCHECK(child->parent()->id() != kShellWindowId_PanelContainer); |
return; |