| Index: trunk/src/mojo/services/view_manager/node.cc
|
| ===================================================================
|
| --- trunk/src/mojo/services/view_manager/node.cc (revision 270932)
|
| +++ trunk/src/mojo/services/view_manager/node.cc (working copy)
|
| @@ -40,7 +40,7 @@
|
| SetView(NULL);
|
| }
|
|
|
| -const Node* Node::GetParent() const {
|
| +Node* Node::GetParent() {
|
| if (!window_.parent())
|
| return NULL;
|
| return window_.parent()->GetProperty(kNodeKey);
|
| @@ -54,13 +54,6 @@
|
| window_.RemoveChild(&child->window_);
|
| }
|
|
|
| -const Node* Node::GetRoot() const {
|
| - const aura::Window* window = &window_;
|
| - while (window && window->parent())
|
| - window = window->parent();
|
| - return window->GetProperty(kNodeKey);
|
| -}
|
| -
|
| std::vector<Node*> Node::GetChildren() {
|
| std::vector<Node*> children;
|
| children.reserve(window_.children().size());
|
| @@ -69,10 +62,6 @@
|
| return children;
|
| }
|
|
|
| -bool Node::Contains(const Node* node) const {
|
| - return node && window_.Contains(&(node->window_));
|
| -}
|
| -
|
| void Node::SetView(View* view) {
|
| if (view == view_)
|
| return;
|
|
|