Get rid of ViewManagerTransactions & pending queue.

mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.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_CLIENT_IMPL_H_
 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 45 matching lines @@
   bool OwnsView(Id id) const;
 
   void SetActiveView(Id node_id, Id view_id);
   void SetBounds(Id node_id, const gfx::Rect& bounds);
   void SetViewContents(Id view_id, const SkBitmap& contents);
   void SetFocus(Id node_id);
   void SetVisible(Id node_id, bool visible);
 
   void Embed(const String& url, Id node_id);
 
-  void set_changes_acked_callback(const base::Callback<void(void)>& callback) {
-    changes_acked_callback_ = callback;
+  void set_change_acked_callback(const base::Callback<void(void)>& callback) {
+    change_acked_callback_ = callback;
   }
-  void ClearChangesAckedCallback() {
-    changes_acked_callback_ = base::Callback<void(void)>();
+  void ClearChangeAckedCallback() {
+    change_acked_callback_ = base::Callback<void(void)>();
   }
 
   // Start/stop tracking nodes & views. While tracked, they can be retrieved via
   // ViewManager::GetNode/ViewById.
   void AddNode(Node* node);
   void RemoveNode(Id node_id);
 
   void AddView(View* view);
   void RemoveView(Id view_id);
 
  private:
   friend class RootObserver;
-  friend class ViewManagerTransaction;
 
-  typedef ScopedVector<ViewManagerTransaction> Transactions;
   typedef std::map<Id, Node*> IdToNodeMap;
   typedef std::map<Id, View*> IdToViewMap;
 
   // Overridden from ViewManager:
   virtual void SetWindowManagerDelegate(
       WindowManagerDelegate* delegate) OVERRIDE;
   virtual void DispatchEvent(View* target, EventPtr event) OVERRIDE;
   virtual const std::string& GetEmbedderURL() const OVERRIDE;
   virtual const std::vector<Node*>& GetRoots() const OVERRIDE;
   virtual Node* GetNodeById(Id id) OVERRIDE;
@@ skipping 23 matching lines @@
                                   Id new_view_id,
                                   Id old_view_id) OVERRIDE;
   virtual void OnViewDeleted(Id view_id) OVERRIDE;
   virtual void OnViewInputEvent(Id view,
                                 EventPtr event,
                                 const Callback<void()>& callback) OVERRIDE;
   virtual void OnFocusChanged(Id gained_focus_id, Id lost_focus_id) OVERRIDE;
   virtual void Embed(const String& url) OVERRIDE;
   virtual void DispatchOnViewInputEvent(Id view_id, EventPtr event) 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 AddRoot(Node* root);
   void RemoveRoot(Node* root);
 
+  void OnActionCompleted(bool success);
+  void OnActionCompletedWithErrorCode(ErrorCode code);
+
+  base::Callback<void(bool)> ActionCompletedCallback();
+  base::Callback<void(ErrorCode)> ActionCompletedCallbackWithErrorCode();
+
   bool connected_;
   ConnectionSpecificId connection_id_;
   ConnectionSpecificId next_id_;
 
   std::string creator_url_;
 
-  Transactions pending_transactions_;
-
-  base::Callback<void(void)> changes_acked_callback_;
+  base::Callback<void(void)> change_acked_callback_;
 
   ViewManagerDelegate* delegate_;
   WindowManagerDelegate* window_manager_delegate_;
 
   std::vector<Node*> roots_;
 
   IdToNodeMap nodes_;
   IdToViewMap views_;
 
   ViewManagerService* service_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };
 
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_