| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef COMPONENTS_SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ | 5 #ifndef COMPONENTS_SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ | 
| 6 #define COMPONENTS_SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ | 6 #define COMPONENTS_SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ | 
| 7 | 7 | 
| 8 #include <stddef.h> | 8 #include <stddef.h> | 
| 9 | 9 | 
| 10 #include <map> | 10 #include <map> | 
|  | 11 #include <memory> | 
| 11 | 12 | 
| 12 #include "base/gtest_prod_util.h" | 13 #include "base/gtest_prod_util.h" | 
| 13 #include "base/macros.h" | 14 #include "base/macros.h" | 
| 14 #include "base/synchronization/lock.h" | 15 #include "base/synchronization/lock.h" | 
| 15 #include "components/sync/syncable/entry_kernel.h" | 16 #include "components/sync/syncable/entry_kernel.h" | 
| 16 #include "components/sync/syncable/metahandle_set.h" | 17 #include "components/sync/syncable/metahandle_set.h" | 
| 17 | 18 | 
| 18 namespace syncer { | 19 namespace syncer { | 
| 19 namespace syncable { | 20 namespace syncable { | 
| 20 | 21 | 
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 108   // saved to database. | 109   // saved to database. | 
| 109   ModelTypeSet passive_delete_journal_types_; | 110   ModelTypeSet passive_delete_journal_types_; | 
| 110 | 111 | 
| 111   DISALLOW_COPY_AND_ASSIGN(DeleteJournal); | 112   DISALLOW_COPY_AND_ASSIGN(DeleteJournal); | 
| 112 }; | 113 }; | 
| 113 | 114 | 
| 114 }  // namespace syncable | 115 }  // namespace syncable | 
| 115 }  // namespace syncer | 116 }  // namespace syncer | 
| 116 | 117 | 
| 117 #endif  // COMPONENTS_SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ | 118 #endif  // COMPONENTS_SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_ | 
| OLD | NEW | 
|---|