Introduces another change id to hierarchy mutations

mojo/services/view_manager/view_manager_connection.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 36 matching lines @@
   // Returns the Node with the specified id.
   Node* GetNode(const NodeId& id);
 
   // Returns the View with the specified id.
   View* GetView(const ViewId& id);
 
   // Notifies the client of a hierarchy change.
   void NotifyNodeHierarchyChanged(const NodeId& node,
                                   const NodeId& new_parent,
                                   const NodeId& old_parent,
-                                  TransportChangeId change_id);
+                                  TransportChangeId server_change_id,
+                                  TransportChangeId client_change_id);
   void NotifyNodeViewReplaced(const NodeId& node,
                               const ViewId& new_view_id,
                               const ViewId& old_view_id,
-                              TransportChangeId change_id);
-  void NotifyNodeDeleted(const NodeId& node, TransportChangeId change_id);
+                              TransportChangeId client_change_id);
+  void NotifyNodeDeleted(const NodeId& node,
+                         TransportChangeId server_change_id,
+                         TransportChangeId client_change_id);
 
  private:
   typedef std::map<TransportConnectionSpecificNodeId, Node*> NodeMap;
   typedef std::map<TransportConnectionSpecificViewId, View*> ViewMap;
 
   // Deletes a node owned by this connection. Returns true on success. |source|
   // is the connection that originated the change.
   bool DeleteNodeImpl(ViewManagerConnection* source,
                       const NodeId& node_id,
                       TransportChangeId change_id);
@@ skipping 11 matching lines @@
 
   // Overridden from IViewManager:
   virtual void SetClient(IViewManagerClient* client) OVERRIDE;
   virtual void CreateNode(TransportConnectionSpecificNodeId node_id,
                           const Callback<void(bool)>& callback) OVERRIDE;
   virtual void DeleteNode(TransportNodeId transport_node_id,
                           TransportChangeId change_id,
                           const Callback<void(bool)>& callback) OVERRIDE;
   virtual void AddNode(TransportNodeId parent_id,
                        TransportNodeId child_id,
-                       TransportChangeId change_id,
+                       TransportChangeId server_change_id,
+                       TransportChangeId client_change_id,
                        const Callback<void(bool)>& callback) OVERRIDE;
   virtual void RemoveNodeFromParent(
       TransportNodeId node_id,
-      TransportChangeId change_id,
+      TransportChangeId server_change_id,
+      TransportChangeId client_change_id,
       const Callback<void(bool)>& callback) OVERRIDE;
   virtual void GetNodeTree(
       TransportNodeId node_id,
       const Callback<void(Array<INode>)>& callback) OVERRIDE;
   virtual void CreateView(TransportConnectionSpecificViewId view_id,
                           const Callback<void(bool)>& callback) OVERRIDE;
   virtual void DeleteView(TransportViewId transport_view_id,
                           TransportChangeId change_id,
                           const Callback<void(bool)>& callback) OVERRIDE;
   virtual void SetView(TransportNodeId transport_node_id,
@@ skipping 27 matching lines @@
 
 #if defined(OS_WIN)
 #pragma warning(pop)
 #endif
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_