Revert 268218 "Add support for mapping node tree on the client."

trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h

Index: trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h
===================================================================
--- trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h	(revision 268224)
+++ trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h	(working copy)
@@ -8,7 +8,6 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/public/cpp/bindings/remote_ptr.h"
-#include "mojo/services/public/cpp/view_manager/view_manager_types.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 
 namespace mojo {
@@ -24,21 +23,12 @@
   explicit ViewManagerSynchronizer(ViewManager* view_manager);
   virtual ~ViewManagerSynchronizer();
 
-  bool connected() const { return connected_; }
-
   // API exposed to the node implementation that pushes local changes to the
   // service.
   uint16_t CreateViewTreeNode();
-  void DestroyViewTreeNode(TransportNodeId node_id);
+  void AddChild(uint16_t child_id, uint16_t parent_id);
+  void RemoveChild(uint16_t child_id, uint16_t parent_id);
 
-  // These methods take TransportIds. For views owned by the current connection,
-  // the connection id high word can be zero. In all cases, the TransportId 0x1
-  // refers to the root node.
-  void AddChild(TransportNodeId child_id, TransportNodeId parent_id);
-  void RemoveChild(TransportNodeId child_id, TransportNodeId parent_id);
-
-  void BuildNodeTree(const Callback<void()>& callback);
-
  private:
   friend class ViewManagerTransaction;
   typedef ScopedVector<ViewManagerTransaction> Transactions;
@@ -49,10 +39,10 @@
                                       uint32 new_parent,
                                       uint32 old_parent,
                                       uint32 change_id) OVERRIDE;
-  virtual void OnNodeViewReplaced(uint32_t node,
-                                  uint32_t new_view_id,
-                                  uint32_t old_view_id,
-                                  uint32_t change_id) OVERRIDE;
+  virtual void OnNodeViewReplaced(uint32_t node,
+                                  uint32_t new_view_id,
+                                  uint32_t old_view_id,
+                                  uint32_t change_id) OVERRIDE;
 
   // Called to schedule a sync of the client model with the service after a
   // return to the message loop.
@@ -68,18 +58,10 @@
   //             the queue?
   uint32_t GetNextChangeId();
 
-  // Called from transactions to notify when a commit is made to the service and
-  // when a response is received.
-  void NotifyCommit();
-  void NotifyCommitResponse(bool success);
-
   // Removes |transaction| from the pending queue. |transaction| must be at the
   // front of the queue.
   void RemoveFromPendingQueue(ViewManagerTransaction* transaction);
 
-  void OnTreeReceived(const Callback<void()>& callback,
-                      const Array<INode>& data);
-
   ViewManager* view_manager_;
   bool connected_;
   uint16_t connection_id_;