Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5415)

Unified Diff: chrome/browser/sync/engine/post_commit_message_command.cc

Issue 9113024: Add return values to SyncerCommand (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move syncer_error.* to internal_api/includes Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/engine/post_commit_message_command.cc
diff --git a/chrome/browser/sync/engine/post_commit_message_command.cc b/chrome/browser/sync/engine/post_commit_message_command.cc
index c70a1936d96d4b69165effccf1faf9e8bd105b76..4379a80d77aa2e966ea69096630862a56363f979 100644
--- a/chrome/browser/sync/engine/post_commit_message_command.cc
+++ b/chrome/browser/sync/engine/post_commit_message_command.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -19,14 +19,15 @@ namespace browser_sync {
PostCommitMessageCommand::PostCommitMessageCommand() {}
PostCommitMessageCommand::~PostCommitMessageCommand() {}
-void PostCommitMessageCommand::ExecuteImpl(sessions::SyncSession* session) {
+SyncerError PostCommitMessageCommand::ExecuteImpl(
+ sessions::SyncSession* session) {
if (session->status_controller().commit_ids().empty())
- return; // Nothing to commit.
+ return SYNCER_OK; // Nothing to commit.
ClientToServerResponse response;
syncable::ScopedDirLookup dir(session->context()->directory_manager(),
session->context()->account_name());
if (!dir.good())
- return;
+ return DIRECTORY_LOOKUP_FAILED;
sessions::StatusController* status = session->mutable_status_controller();
if (!SyncerProtoUtil::PostClientToServerMessage(status->commit_message(),
&response, session)) {
@@ -41,11 +42,13 @@ void PostCommitMessageCommand::ExecuteImpl(sessions::SyncSession* session) {
syncable::MutableEntry entry(&trans, syncable::GET_BY_ID, commit_ids[i]);
entry.Put(syncable::SYNCING, false);
}
- return;
+ return SYNCER_OK; // TODO(rlarocque): Return an error here.
} else {
status->set_items_committed();
}
+
status->mutable_commit_response()->CopyFrom(response);
+ return SYNCER_OK;
}
} // namespace browser_sync
« no previous file with comments | « chrome/browser/sync/engine/post_commit_message_command.h ('k') | chrome/browser/sync/engine/process_commit_response_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698