| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sync/engine/process_commit_response_command.h" | 5 #include "sync/engine/process_commit_response_command.h" |
| 6 | 6 |
| 7 #include <cstddef> | 7 #include <cstddef> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 using syncable::IS_UNAPPLIED_UPDATE; | 38 using syncable::IS_UNAPPLIED_UPDATE; |
| 39 using syncable::IS_UNSYNCED; | 39 using syncable::IS_UNSYNCED; |
| 40 using syncable::PARENT_ID; | 40 using syncable::PARENT_ID; |
| 41 using syncable::SERVER_IS_DEL; | 41 using syncable::SERVER_IS_DEL; |
| 42 using syncable::SERVER_PARENT_ID; | 42 using syncable::SERVER_PARENT_ID; |
| 43 using syncable::SERVER_POSITION_IN_PARENT; | 43 using syncable::SERVER_POSITION_IN_PARENT; |
| 44 using syncable::SERVER_VERSION; | 44 using syncable::SERVER_VERSION; |
| 45 using syncable::SYNCER; | 45 using syncable::SYNCER; |
| 46 using syncable::SYNCING; | 46 using syncable::SYNCING; |
| 47 | 47 |
| 48 namespace csync { | 48 namespace syncer { |
| 49 | 49 |
| 50 using sessions::OrderedCommitSet; | 50 using sessions::OrderedCommitSet; |
| 51 using sessions::StatusController; | 51 using sessions::StatusController; |
| 52 using sessions::SyncSession; | 52 using sessions::SyncSession; |
| 53 using sessions::ConflictProgress; | 53 using sessions::ConflictProgress; |
| 54 | 54 |
| 55 ProcessCommitResponseCommand::ProcessCommitResponseCommand( | 55 ProcessCommitResponseCommand::ProcessCommitResponseCommand( |
| 56 const sessions::OrderedCommitSet& commit_set, | 56 const sessions::OrderedCommitSet& commit_set, |
| 57 const ClientToServerMessage& commit_message, | 57 const ClientToServerMessage& commit_message, |
| 58 const ClientToServerResponse& commit_response) | 58 const ClientToServerResponse& commit_response) |
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 470 // Make a note of any deleted folders, whose children would have | 470 // Make a note of any deleted folders, whose children would have |
| 471 // been recursively deleted. | 471 // been recursively deleted. |
| 472 // TODO(nick): Here, commit_message.deleted() would be more correct than | 472 // TODO(nick): Here, commit_message.deleted() would be more correct than |
| 473 // local_entry->Get(IS_DEL). For example, an item could be renamed, and then | 473 // local_entry->Get(IS_DEL). For example, an item could be renamed, and then |
| 474 // deleted during the commit of the rename. Unit test & fix. | 474 // deleted during the commit of the rename. Unit test & fix. |
| 475 if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) { | 475 if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) { |
| 476 deleted_folders->insert(local_entry->Get(ID)); | 476 deleted_folders->insert(local_entry->Get(ID)); |
| 477 } | 477 } |
| 478 } | 478 } |
| 479 | 479 |
| 480 } // namespace csync | 480 } // namespace syncer |
| OLD | NEW |