| 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> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/location.h" | 13 #include "base/location.h" |
| 14 #include "sync/engine/syncer_proto_util.h" | 14 #include "sync/engine/syncer_proto_util.h" |
| 15 #include "sync/engine/syncer_util.h" | 15 #include "sync/engine/syncer_util.h" |
| 16 #include "sync/internal_api/public/util/time.h" |
| 16 #include "sync/sessions/sync_session.h" | 17 #include "sync/sessions/sync_session.h" |
| 17 #include "sync/syncable/entry.h" | 18 #include "sync/syncable/entry.h" |
| 18 #include "sync/syncable/mutable_entry.h" | 19 #include "sync/syncable/mutable_entry.h" |
| 19 #include "sync/syncable/read_transaction.h" | 20 #include "sync/syncable/read_transaction.h" |
| 20 #include "sync/syncable/syncable_proto_util.h" | 21 #include "sync/syncable/syncable_proto_util.h" |
| 21 #include "sync/syncable/syncable_util.h" | 22 #include "sync/syncable/syncable_util.h" |
| 22 #include "sync/syncable/write_transaction.h" | 23 #include "sync/syncable/write_transaction.h" |
| 23 #include "sync/util/time.h" | |
| 24 | 24 |
| 25 using std::set; | 25 using std::set; |
| 26 using std::string; | 26 using std::string; |
| 27 using std::vector; | 27 using std::vector; |
| 28 using sync_pb::CommitResponse; | 28 using sync_pb::CommitResponse; |
| 29 | 29 |
| 30 namespace syncer { | 30 namespace syncer { |
| 31 | 31 |
| 32 using sessions::OrderedCommitSet; | 32 using sessions::OrderedCommitSet; |
| 33 using sessions::StatusController; | 33 using sessions::StatusController; |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 // been recursively deleted. | 472 // been recursively deleted. |
| 473 // TODO(nick): Here, commit_message.deleted() would be more correct than | 473 // TODO(nick): Here, commit_message.deleted() would be more correct than |
| 474 // local_entry->Get(IS_DEL). For example, an item could be renamed, and then | 474 // local_entry->Get(IS_DEL). For example, an item could be renamed, and then |
| 475 // deleted during the commit of the rename. Unit test & fix. | 475 // deleted during the commit of the rename. Unit test & fix. |
| 476 if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) { | 476 if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) { |
| 477 deleted_folders->insert(local_entry->Get(ID)); | 477 deleted_folders->insert(local_entry->Get(ID)); |
| 478 } | 478 } |
| 479 } | 479 } |
| 480 | 480 |
| 481 } // namespace syncer | 481 } // namespace syncer |
| OLD | NEW |