| Index: mojo/services/view_manager/root_node_manager.h
|
| diff --git a/mojo/services/view_manager/root_node_manager.h b/mojo/services/view_manager/root_node_manager.h
|
| index f9d1d97b049c5441671674ba883ea11bc57a0111..98f347e0c9ed3746263aed3594f92c9c7e94da1d 100644
|
| --- a/mojo/services/view_manager/root_node_manager.h
|
| +++ b/mojo/services/view_manager/root_node_manager.h
|
| @@ -32,7 +32,7 @@
|
| public:
|
| ScopedChange(ViewManagerConnection* connection,
|
| RootNodeManager* root,
|
| - ChangeId change_id);
|
| + int32_t change_id);
|
| ~ScopedChange();
|
|
|
| private:
|
| @@ -71,13 +71,13 @@
|
| private:
|
| // Tracks a change.
|
| struct Change {
|
| - Change(int32_t connection_id, ChangeId change_id)
|
| + Change(int32_t connection_id, int32_t change_id)
|
| : connection_id(connection_id),
|
| change_id(change_id) {
|
| }
|
|
|
| int32_t connection_id;
|
| - ChangeId change_id;
|
| + int32_t change_id;
|
| };
|
|
|
| typedef std::map<uint16_t, ViewManagerConnection*> ConnectionMap;
|
| @@ -88,7 +88,7 @@
|
| // Changes should never nest, meaning each PrepareForChange() must be
|
| // balanced with a call to FinishChange() with no PrepareForChange()
|
| // in between.
|
| - void PrepareForChange(ViewManagerConnection* connection, ChangeId change_id);
|
| + void PrepareForChange(ViewManagerConnection* connection, int32_t change_id);
|
|
|
| // Balances a call to PrepareForChange().
|
| void FinishChange();
|
|
|