Tweaks to ViewManager:

mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.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_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_SYNCHRONIZER_H_
 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_SYNCHRONIZER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 37 matching lines @@
 
   void SetActiveView(TransportNodeId node_id, TransportViewId view_id);
 
  private:
   friend class ViewManagerTransaction;
   typedef ScopedVector<ViewManagerTransaction> Transactions;
 
   // Overridden from IViewManagerClient:
   virtual void OnConnectionEstablished(
       TransportConnectionId connection_id,
-      TransportChangeId next_server_change_id) OVERRIDE;
+      TransportChangeId next_server_change_id,
+      const mojo::Array<INode>& nodes) OVERRIDE;
+  virtual void OnServerChangeIdAdvanced(
+      uint32_t next_server_change_id) OVERRIDE;
   virtual void OnNodeHierarchyChanged(
       uint32 node_id,
       uint32 new_parent_id,
       uint32 old_parent_id,
-      TransportChangeId server_change_id) OVERRIDE;
+      TransportChangeId server_change_id,
+      const mojo::Array<INode>& nodes) OVERRIDE;
   virtual void OnNodeDeleted(TransportNodeId node_id,
                              TransportChangeId server_change_id) OVERRIDE;
   virtual void OnNodeViewReplaced(uint32_t node,
                                   uint32_t new_view_id,
                                   uint32_t old_view_id) OVERRIDE;
   virtual void OnViewDeleted(uint32_t view_id) OVERRIDE;
 
   // Sync the client model with the service by enumerating the pending
   // transaction queue and applying them in order.
   void Sync();
 
   // Removes |transaction| from the pending queue. |transaction| must be at the
   // front of the queue.
   void RemoveFromPendingQueue(ViewManagerTransaction* transaction);
 
-  void OnRootTreeReceived(const Array<INode>& data);
-
   ViewManager* view_manager_;
   bool connected_;
   TransportConnectionId connection_id_;
   uint16_t next_id_;
   TransportChangeId next_server_change_id_;
 
   Transactions pending_transactions_;
 
   base::WeakPtrFactory<ViewManagerSynchronizer> sync_factory_;
 
   // Non-NULL while blocking on the connection to |service_| during
   // construction.
   base::RunLoop* init_loop_;
 
   IViewManagerPtr service_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerSynchronizer);
 };
 
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_SYNCHRONIZER_H_