| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ | 5 #ifndef CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ |
| 6 #define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ | 6 #define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 BookmarkIdToSyncIdMap id_map_; | 128 BookmarkIdToSyncIdMap id_map_; |
| 129 SyncIdToBookmarkNodeMap id_map_inverse_; | 129 SyncIdToBookmarkNodeMap id_map_inverse_; |
| 130 // Stores sync ids for dirty associations. | 130 // Stores sync ids for dirty associations. |
| 131 DirtyAssociationsSyncIds dirty_associations_sync_ids_; | 131 DirtyAssociationsSyncIds dirty_associations_sync_ids_; |
| 132 | 132 |
| 133 // Used to post PersistAssociation tasks to the current message loop and | 133 // Used to post PersistAssociation tasks to the current message loop and |
| 134 // guarantees no invocations can occur if |this| has been deleted. (This | 134 // guarantees no invocations can occur if |this| has been deleted. (This |
| 135 // allows this class to be non-refcounted). | 135 // allows this class to be non-refcounted). |
| 136 ScopedRunnableMethodFactory<BookmarkModelAssociator> persist_associations_; | 136 ScopedRunnableMethodFactory<BookmarkModelAssociator> persist_associations_; |
| 137 | 137 |
| 138 int number_of_new_sync_nodes_created_at_association_; |
| 139 |
| 138 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); | 140 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); |
| 139 }; | 141 }; |
| 140 | 142 |
| 141 } // namespace browser_sync | 143 } // namespace browser_sync |
| 142 | 144 |
| 143 #endif // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ | 145 #endif // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ |
| OLD | NEW |