| Index: mojo/services/view_manager/root_node_manager.cc
|
| diff --git a/mojo/services/view_manager/root_node_manager.cc b/mojo/services/view_manager/root_node_manager.cc
|
| index 6c2bf6d96d8b20d8f8321d0087d74f946230d1c8..210427a1f47a944ac778bb4c32aafe44656086fb 100644
|
| --- a/mojo/services/view_manager/root_node_manager.cc
|
| +++ b/mojo/services/view_manager/root_node_manager.cc
|
| @@ -19,7 +19,7 @@
|
|
|
| RootNodeManager::ScopedChange::ScopedChange(ViewManagerConnection* connection,
|
| RootNodeManager* root,
|
| - ChangeId change_id)
|
| + int32_t change_id)
|
| : root_(root) {
|
| root_->PrepareForChange(connection, change_id);
|
| }
|
| @@ -73,7 +73,7 @@
|
| const NodeId& old_parent) {
|
| for (ConnectionMap::iterator i = connection_map_.begin();
|
| i != connection_map_.end(); ++i) {
|
| - const ChangeId change_id = (change_ && i->first == change_->connection_id) ?
|
| + const int32_t change_id = (change_ && i->first == change_->connection_id) ?
|
| change_->change_id : 0;
|
| i->second->NotifyNodeHierarchyChanged(
|
| node, new_parent, old_parent, change_id);
|
| @@ -86,7 +86,7 @@
|
| // TODO(sky): make a macro for this.
|
| for (ConnectionMap::iterator i = connection_map_.begin();
|
| i != connection_map_.end(); ++i) {
|
| - const ChangeId change_id = (change_ && i->first == change_->connection_id) ?
|
| + const int32_t change_id = (change_ && i->first == change_->connection_id) ?
|
| change_->change_id : 0;
|
| i->second->NotifyNodeViewReplaced(node, new_view_id, old_view_id,
|
| change_id);
|
| @@ -94,7 +94,7 @@
|
| }
|
|
|
| void RootNodeManager::PrepareForChange(ViewManagerConnection* connection,
|
| - ChangeId change_id) {
|
| + int32_t change_id) {
|
| DCHECK(!change_.get()); // Should only ever have one change in flight.
|
| change_.reset(new Change(connection->id(), change_id));
|
| }
|
|
|