| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "components/sync/syncable/mutable_entry.h" | 5 #include "components/sync/syncable/mutable_entry.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| 11 #include "components/sync/base/unique_position.h" | 11 #include "components/sync/base/unique_position.h" |
| 12 #include "components/sync/syncable/directory.h" | 12 #include "components/sync/syncable/directory.h" |
| 13 #include "components/sync/syncable/scoped_kernel_lock.h" | 13 #include "components/sync/syncable/scoped_kernel_lock.h" |
| 14 #include "components/sync/syncable/scoped_parent_child_index_updater.h" | 14 #include "components/sync/syncable/scoped_parent_child_index_updater.h" |
| 15 #include "components/sync/syncable/syncable-inl.h" | |
| 16 #include "components/sync/syncable/syncable_changes_version.h" | 15 #include "components/sync/syncable/syncable_changes_version.h" |
| 17 #include "components/sync/syncable/syncable_util.h" | 16 #include "components/sync/syncable/syncable_util.h" |
| 18 #include "components/sync/syncable/syncable_write_transaction.h" | 17 #include "components/sync/syncable/syncable_write_transaction.h" |
| 19 | 18 |
| 20 using std::string; | 19 using std::string; |
| 21 | 20 |
| 22 namespace syncer { | 21 namespace syncer { |
| 23 namespace syncable { | 22 namespace syncable { |
| 24 | 23 |
| 25 void MutableEntry::Init(WriteTransaction* trans, | 24 void MutableEntry::Init(WriteTransaction* trans, |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 DCHECK(!e->IsRoot()) << "We shouldn't mark a permanent object for syncing."; | 311 DCHECK(!e->IsRoot()) << "We shouldn't mark a permanent object for syncing."; |
| 313 if (!(e->PutIsUnsynced(true))) | 312 if (!(e->PutIsUnsynced(true))) |
| 314 return false; | 313 return false; |
| 315 if (e->GetSyncing()) | 314 if (e->GetSyncing()) |
| 316 e->PutDirtySync(true); | 315 e->PutDirtySync(true); |
| 317 return true; | 316 return true; |
| 318 } | 317 } |
| 319 | 318 |
| 320 } // namespace syncable | 319 } // namespace syncable |
| 321 } // namespace syncer | 320 } // namespace syncer |
| OLD | NEW |