Revert 270925 "Tweaks to ViewManager:"

trunk/src/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 22 matching lines @@
   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);
 }
 
-const Node* Node::GetParent() const {
+Node* Node::GetParent() {
   if (!window_.parent())
     return NULL;
   return window_.parent()->GetProperty(kNodeKey);
 }
 
 void Node::Add(Node* child) {
   window_.AddChild(&child->window_);
 }
 
 void Node::Remove(Node* child) {
   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());
   for (size_t i = 0; i < window_.children().size(); ++i)
     children.push_back(window_.children()[i]->GetProperty(kNodeKey));
   return children;
 }
 
-bool Node::Contains(const Node* node) const {
-  return node && window_.Contains(&(node->window_));
-}
-
 void Node::SetView(View* view) {
   if (view == view_)
     return;
 
   // Detach view from existing node. This way notifications are sent out.
   if (view && view->node())
     view->node()->SetView(NULL);
 
   ViewId old_view_id;
   if (view_) {
@@ skipping 77 matching lines @@
 bool Node::HasHitTestMask() const {
   return false;
 }
 
 void Node::GetHitTestMask(gfx::Path* mask) const {
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo