| Index: trunk/src/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc
|
| ===================================================================
|
| --- trunk/src/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc (revision 266943)
|
| +++ trunk/src/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc (working copy)
|
| @@ -4,8 +4,6 @@
|
|
|
| #include "mojo/services/public/cpp/view_manager/view_tree_node.h"
|
|
|
| -#include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h"
|
| -#include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h"
|
| #include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
|
| #include "mojo/services/public/cpp/view_manager/view_tree_node_observer.h"
|
|
|
| @@ -90,18 +88,8 @@
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // ViewTreeNode, public:
|
|
|
| -ViewTreeNode::ViewTreeNode()
|
| - : manager_(NULL),
|
| - id_(-1),
|
| - owned_by_parent_(true),
|
| - parent_(NULL) {}
|
| +ViewTreeNode::ViewTreeNode() : owned_by_parent_(true), parent_(NULL) {}
|
|
|
| -ViewTreeNode::ViewTreeNode(ViewManager* manager)
|
| - : manager_(manager),
|
| - id_(ViewManagerPrivate(manager).synchronizer()->CreateViewTreeNode()),
|
| - owned_by_parent_(true),
|
| - parent_(NULL) {}
|
| -
|
| ViewTreeNode::~ViewTreeNode() {
|
| while (!children_.empty()) {
|
| ViewTreeNode* child = children_.front();
|
| @@ -134,14 +122,12 @@
|
| RemoveChildImpl(child, &child->parent_->children_);
|
| children_.push_back(child);
|
| child->parent_ = this;
|
| - ViewManagerPrivate(manager_).synchronizer()->AddChild(child->id(), id_);
|
| }
|
|
|
| void ViewTreeNode::RemoveChild(ViewTreeNode* child) {
|
| DCHECK_EQ(this, child->parent());
|
| ScopedTreeNotifier(child, this, NULL);
|
| RemoveChildImpl(child, &children_);
|
| - ViewManagerPrivate(manager_).synchronizer()->RemoveChild(child->id(), id_);
|
| }
|
|
|
| bool ViewTreeNode::Contains(ViewTreeNode* child) const {
|
|
|