| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/sync/engine_impl/directory_commit_contribution.h" | 5 #include "components/sync/engine_impl/directory_commit_contribution.h" |
| 6 | 6 |
| 7 #include <stddef.h> | |
| 8 #include <stdint.h> | |
| 9 | |
| 10 #include <algorithm> | 7 #include <algorithm> |
| 11 #include <set> | 8 #include <set> |
| 12 | 9 |
| 13 #include "components/sync/engine/cycle/commit_counters.h" | 10 #include "components/sync/engine/cycle/commit_counters.h" |
| 14 #include "components/sync/engine_impl/commit_util.h" | 11 #include "components/sync/engine_impl/commit_util.h" |
| 15 #include "components/sync/engine_impl/get_commit_ids.h" | 12 #include "components/sync/engine_impl/get_commit_ids.h" |
| 16 #include "components/sync/engine_impl/syncer_util.h" | 13 #include "components/sync/engine_impl/syncer_util.h" |
| 17 #include "components/sync/syncable/model_neutral_mutable_entry.h" | 14 #include "components/sync/syncable/model_neutral_mutable_entry.h" |
| 18 #include "components/sync/syncable/syncable_model_neutral_write_transaction.h" | 15 #include "components/sync/syncable/syncable_model_neutral_write_transaction.h" |
| 19 | 16 |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 // complete but the Cleanup method is called anyways. It appears these are | 183 // complete but the Cleanup method is called anyways. It appears these are |
| 187 // unset on the assumption that the sync cycle must have finished properly, | 184 // unset on the assumption that the sync cycle must have finished properly, |
| 188 // although that's actually up to the commit response handling logic. | 185 // although that's actually up to the commit response handling logic. |
| 189 entry.PutDirtySync(false); | 186 entry.PutDirtySync(false); |
| 190 entry.PutSyncing(false); | 187 entry.PutSyncing(false); |
| 191 } | 188 } |
| 192 syncing_bits_set_ = false; | 189 syncing_bits_set_ = false; |
| 193 } | 190 } |
| 194 | 191 |
| 195 } // namespace syncer | 192 } // namespace syncer |
| OLD | NEW |