diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-07 04:35:34 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-07 04:35:34 +0000 |
| commit | 10d21cf982fd0c884f14cd1e94f1b7517044c4ac (patch) | |
| tree | e7a3b527bc276d031f9370d8dafd9b37d95640a4 /ui | |
| parent | 31b47de7dbc20584f79a21aa1e1ad1b7c9df0f47 (diff) | |
| download | chromium_src-10d21cf982fd0c884f14cd1e94f1b7517044c4ac.zip chromium_src-10d21cf982fd0c884f14cd1e94f1b7517044c4ac.tar.gz chromium_src-10d21cf982fd0c884f14cd1e94f1b7517044c4ac.tar.bz2 | |
Turn on TabContentsViewAura by default.
http://crbug.com/118410
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=131132
Review URL: https://chromiumcodereview.appspot.com/10005028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/window.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/aura/window.cc b/ui/aura/window.cc index c48a622..e1d9729 100644 --- a/ui/aura/window.cc +++ b/ui/aura/window.cc @@ -85,9 +85,10 @@ Window::~Window() { DCHECK(std::find(children_.begin(), children_.end(), child) == children_.end()); } else { - // We don't call SetParent() since that may do unexpected things like - // reparent the window. - child->parent_ = NULL; + // Even if we can't delete the child, we still need to remove it from the + // parent so that relevant bookkeeping (parent_ back-pointers etc) are + // updated. + RemoveChild(child); } } |