Finishes up setroots

mojo/services/view_manager/node.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/services/view_manager/node.h"
 
 #include "mojo/services/view_manager/node_delegate.h"
 #include "mojo/services/view_manager/view.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/cursor/cursor.h"
@@ skipping 20 matching lines @@
   window_.AddObserver(this);
   window_.SetProperty(kNodeKey, this);
   window_.Init(aura::WINDOW_LAYER_TEXTURED);
 
   // TODO(sky): this likely needs to be false and add a visibility API.
   window_.Show();
 }
 
 Node::~Node() {
   SetView(NULL);
+  // This is implicitly done during deletion of the window, but we do it here so
+  // that we're in a known state.
+  if (window_.parent())
+    window_.parent()->RemoveChild(&window_);
 }
 
 const Node* Node::GetParent() const {
   if (!window_.parent())
     return NULL;
   return window_.parent()->GetProperty(kNodeKey);
 }
 
 void Node::Add(Node* child) {
   window_.AddChild(&child->window_);
@@ skipping 113 matching lines @@
 bool Node::HasHitTestMask() const {
   return false;
 }
 
 void Node::GetHitTestMask(gfx::Path* mask) const {
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo