Cleanup of ViewManager

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 43 matching lines @@
   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<const Node*> Node::GetChildren() const {
+  std::vector<const 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;
+}
+
 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_) {
+  View* old_view = view_;
+  if (view_)
     view_->set_node(NULL);
-    old_view_id = view_->id();
-  }
   view_ = view;
-  ViewId view_id;
-  if (view) {
-    view_id = view->id();
+  if (view)
     view->set_node(this);
-  }
-  delegate_->OnNodeViewReplaced(id_, view_id, old_view_id);
+  delegate_->OnNodeViewReplaced(this, view, old_view);
 }
 
 void Node::OnWindowHierarchyChanged(
     const aura::WindowObserver::HierarchyChangeParams& params) {
   if (params.target != &window_ || params.receiver != &window_)
     return;
-  NodeId new_parent_id;
-  if (params.new_parent && params.new_parent->GetProperty(kNodeKey))
-    new_parent_id = params.new_parent->GetProperty(kNodeKey)->id();
-  NodeId old_parent_id;
-  if (params.old_parent && params.old_parent->GetProperty(kNodeKey))
-    old_parent_id = params.old_parent->GetProperty(kNodeKey)->id();
-  delegate_->OnNodeHierarchyChanged(id_, new_parent_id, old_parent_id);
+  const Node* new_parent = params.new_parent ?
+      params.new_parent->GetProperty(kNodeKey) : NULL;
+  const Node* old_parent = params.old_parent ?
+      params.old_parent->GetProperty(kNodeKey) : NULL;
+  delegate_->OnNodeHierarchyChanged(this, new_parent, old_parent);
 }
 
 gfx::Size Node::GetMinimumSize() const {
   return gfx::Size();
 }
 
 gfx::Size Node::GetMaximumSize() const {
   return gfx::Size();
 }
 
@@ skipping 44 matching lines @@
 bool Node::HasHitTestMask() const {
   return false;
 }
 
 void Node::GetHitTestMask(gfx::Path* mask) const {
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo