Chromium Code Reviews| 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..e27b92473574014fb5e3681ae803d41dd6280e28 100644 |
| --- a/chrome/browser/sync/engine/post_commit_message_command.cc |
| +++ b/chrome/browser/sync/engine/post_commit_message_command.cc |
| @@ -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 NO_ERROR; // 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 NO_ERROR; // TODO(rlarocque): Return an error here. |
|
tim (not reviewing)
2012/01/06 16:33:42
See my earlier comment about PostClientToServerMes
rlarocque
2012/01/06 19:44:21
My earlier response applies here, too.
|
| } else { |
| status->set_items_committed(); |
| } |
| + |
| status->mutable_commit_response()->CopyFrom(response); |
| + return NO_ERROR; |
| } |
| } // namespace browser_sync |