Index: trunk/src/mojo/services/public/cpp/view_manager/view_tree_node.h |
=================================================================== |
--- trunk/src/mojo/services/public/cpp/view_manager/view_tree_node.h (revision 268224) |
+++ trunk/src/mojo/services/public/cpp/view_manager/view_tree_node.h (working copy) |
@@ -9,7 +9,6 @@ |
#include "base/basictypes.h" |
#include "base/observer_list.h" |
-#include "mojo/services/public/cpp/view_manager/view_manager_types.h" |
namespace mojo { |
namespace services { |
@@ -27,7 +26,7 @@ |
~ViewTreeNode(); |
// Configuration. |
- TransportNodeId id() const { return id_; } |
+ uint16_t id() const { return id_; } |
void set_owned_by_parent(bool owned_by_parent) { |
owned_by_parent_ = owned_by_parent; |
} |
@@ -49,11 +48,8 @@ |
private: |
friend class ViewTreeNodePrivate; |
- void LocalAddChild(ViewTreeNode* child); |
- void LocalRemoveChild(ViewTreeNode* child); |
- |
ViewManager* manager_; |
- TransportNodeId id_; |
+ uint16_t id_; |
bool owned_by_parent_; |
ViewTreeNode* parent_; |
Children children_; |