Start of adding enums for error codes

mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

 // 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.
 
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/connect.h"
@@ skipping 119 matching lines @@
   // Overridden to perform transaction-specific cleanup on commit ack from the
   // service.
   virtual void DoActionCompleted(bool success) = 0;
 
   ViewManagerService* service() { return client_->service_; }
 
   Id GetAndAdvanceNextServerChangeId() {
     return client_->next_server_change_id_++;
   }
 
+  // TODO(sky): nuke this and covert all to new one, then rename
+  // ActionCompletedCallbackWithErrorCode to ActionCompletedCallback.
   base::Callback<void(bool)> ActionCompletedCallback() {
     return base::Bind(&ViewManagerTransaction::OnActionCompleted,
                       base::Unretained(this));
   }
 
+  base::Callback<void(ErrorCode)> ActionCompletedCallbackWithErrorCode() {
+    return base::Bind(&ViewManagerTransaction::OnActionCompletedWithErrorCode,
+                      base::Unretained(this));
+  }
+
  private:
   // General callback to be used for commits to the service.
   void OnActionCompleted(bool success) {
     DoActionCompleted(success);
     client_->RemoveFromPendingQueue(this);
   }
 
+  void OnActionCompletedWithErrorCode(ErrorCode error_code) {
+    DoActionCompleted(error_code == ERROR_CODE_NONE);
+    client_->RemoveFromPendingQueue(this);
+  }
+
   bool committed_;
   ViewManagerClientImpl* client_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerTransaction);
 };
 
 class CreateViewTransaction : public ViewManagerTransaction {
  public:
   CreateViewTransaction(Id view_id, ViewManagerClientImpl* client)
       : ViewManagerTransaction(client),
@@ skipping 40 matching lines @@
 class CreateNodeTransaction : public ViewManagerTransaction {
  public:
   CreateNodeTransaction(Id node_id, ViewManagerClientImpl* client)
       : ViewManagerTransaction(client),
         node_id_(node_id) {}
   virtual ~CreateNodeTransaction() {}
 
  private:
   // Overridden from ViewManagerTransaction:
   virtual void DoCommit() OVERRIDE {
-    service()->CreateNode(node_id_, ActionCompletedCallback());
+    service()->CreateNode(node_id_, ActionCompletedCallbackWithErrorCode());
   }
   virtual void DoActionCompleted(bool success) OVERRIDE {
     // TODO(beng): Failure means we tried to create with an extant id for this
     //             connection. It also could mean we tried to do something
     //             invalid, or we tried applying a change out of order. Figure
     //             out what to do.
     DCHECK(success);
   }
 
   const Id node_id_;
@@ skipping 675 matching lines @@
 
 // static
 void ViewManager::ConfigureIncomingConnection(
     ApplicationConnection* connection,
     ViewManagerDelegate* delegate) {
   connection->AddService<ViewManagerClientImpl>(delegate);
 }
 
 }  // namespace view_manager
 }  // namespace mojo