| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/sync/engine/get_commit_ids_command.h" | 5 #include "chrome/browser/sync/engine/get_commit_ids_command.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "chrome/browser/sync/engine/nigori_util.h" | 11 #include "chrome/browser/sync/engine/nigori_util.h" |
| 12 #include "chrome/browser/sync/engine/syncer_util.h" | 12 #include "chrome/browser/sync/engine/syncer_util.h" |
| 13 #include "chrome/browser/sync/syncable/directory_manager.h" | 13 #include "chrome/browser/sync/syncable/directory_manager.h" |
| 14 #include "chrome/browser/sync/syncable/syncable.h" | 14 #include "chrome/browser/sync/syncable/syncable.h" |
| 15 #include "chrome/browser/sync/util/cryptographer.h" | 15 #include "chrome/browser/sync/encryption/cryptographer.h" |
| 16 | 16 |
| 17 using std::set; | 17 using std::set; |
| 18 using std::vector; | 18 using std::vector; |
| 19 | 19 |
| 20 namespace browser_sync { | 20 namespace browser_sync { |
| 21 | 21 |
| 22 using sessions::OrderedCommitSet; | 22 using sessions::OrderedCommitSet; |
| 23 using sessions::SyncSession; | 23 using sessions::SyncSession; |
| 24 using sessions::StatusController; | 24 using sessions::StatusController; |
| 25 | 25 |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 // delete trees. | 325 // delete trees. |
| 326 | 326 |
| 327 // Add moves and creates, and prepend their uncommitted parents. | 327 // Add moves and creates, and prepend their uncommitted parents. |
| 328 AddCreatesAndMoves(unsynced_handles, write_transaction, routes); | 328 AddCreatesAndMoves(unsynced_handles, write_transaction, routes); |
| 329 | 329 |
| 330 // Add all deletes. | 330 // Add all deletes. |
| 331 AddDeletes(unsynced_handles, write_transaction); | 331 AddDeletes(unsynced_handles, write_transaction); |
| 332 } | 332 } |
| 333 | 333 |
| 334 } // namespace browser_sync | 334 } // namespace browser_sync |
| OLD | NEW |