| Index: ui/aura/window.cc
|
| diff --git a/ui/aura/window.cc b/ui/aura/window.cc
|
| index 899fdfdb047c14b76f8a72ce270380c75eb911c7..4bb4bbdfab6b7c2dbc4a5198c8ad7b63275d3ad3 100644
|
| --- a/ui/aura/window.cc
|
| +++ b/ui/aura/window.cc
|
| @@ -516,13 +516,14 @@ void Window::AddChild(Window* child) {
|
|
|
| gfx::Vector2d offset;
|
| aura::Window* ancestor_with_layer = GetAncestorWithLayer(&offset);
|
| +
|
| + child->parent_ = this;
|
| +
|
| if (ancestor_with_layer) {
|
| offset += child->bounds().OffsetFromOrigin();
|
| child->ReparentLayers(ancestor_with_layer->layer(), offset);
|
| }
|
|
|
| - child->parent_ = this;
|
| -
|
| children_.push_back(child);
|
| if (layout_manager_)
|
| layout_manager_->OnWindowAddedToLayout(child);
|
|
|