Index: mojo/services/view_manager/test_change_tracker.h |
diff --git a/mojo/services/view_manager/test_change_tracker.h b/mojo/services/view_manager/test_change_tracker.h |
index 6021611556cb71bf859fb7e786053654857ab06d..d597c6faacbd040928d058c7269c256ab192d700 100644 |
--- a/mojo/services/view_manager/test_change_tracker.h |
+++ b/mojo/services/view_manager/test_change_tracker.h |
@@ -20,7 +20,6 @@ namespace service { |
enum ChangeType { |
CHANGE_TYPE_CONNECTION_ESTABLISHED, |
CHANGE_TYPE_ROOTS_ADDED, |
- CHANGE_TYPE_SERVER_CHANGE_ID_ADVANCED, |
CHANGE_TYPE_NODE_BOUNDS_CHANGED, |
CHANGE_TYPE_NODE_HIERARCHY_CHANGED, |
CHANGE_TYPE_NODE_REORDERED, |
@@ -48,7 +47,6 @@ struct Change { |
ChangeType type; |
ConnectionSpecificId connection_id; |
- Id change_id; |
std::vector<TestNode> nodes; |
Id node_id; |
Id node_id2; |
@@ -99,21 +97,17 @@ class TestChangeTracker { |
// ViewManagerClient function. |
void OnViewManagerConnectionEstablished(ConnectionSpecificId connection_id, |
const String& creator_url, |
- Id next_server_change_id, |
Array<NodeDataPtr> nodes); |
void OnRootAdded(Array<NodeDataPtr> nodes); |
- void OnServerChangeIdAdvanced(Id change_id); |
void OnNodeBoundsChanged(Id node_id, RectPtr old_bounds, RectPtr new_bounds); |
void OnNodeHierarchyChanged(Id node_id, |
Id new_parent_id, |
Id old_parent_id, |
- Id server_change_id, |
Array<NodeDataPtr> nodes); |
void OnNodeReordered(Id node_id, |
Id relative_node_id, |
- OrderDirection direction, |
- Id server_change_id); |
- void OnNodeDeleted(Id node_id, Id server_change_id); |
+ OrderDirection direction); |
+ void OnNodeDeleted(Id node_id); |
void OnViewDeleted(Id view_id); |
void OnNodeViewReplaced(Id node_id, Id new_view_id, Id old_view_id); |
void OnViewInputEvent(Id view_id, EventPtr event); |