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