| 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 #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> |
| 11 #include <string> | 11 #include <string> |
| 12 | 12 |
| 13 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
| 14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 15 #include "base/task.h" | 15 #include "base/task.h" |
| 16 #include "chrome/browser/sync/unrecoverable_error_handler.h" | 16 #include "chrome/browser/sync/util/unrecoverable_error_handler.h" |
| 17 #include "chrome/browser/sync/glue/model_associator.h" | 17 #include "chrome/browser/sync/glue/model_associator.h" |
| 18 | 18 |
| 19 class BookmarkModel; | 19 class BookmarkModel; |
| 20 class BookmarkNode; | 20 class BookmarkNode; |
| 21 | 21 |
| 22 namespace sync_api { | 22 namespace sync_api { |
| 23 class BaseNode; | 23 class BaseNode; |
| 24 struct UserShare; | 24 struct UserShare; |
| 25 } | 25 } |
| 26 | 26 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 ScopedRunnableMethodFactory<BookmarkModelAssociator> persist_associations_; | 136 ScopedRunnableMethodFactory<BookmarkModelAssociator> persist_associations_; |
| 137 | 137 |
| 138 int number_of_new_sync_nodes_created_at_association_; | 138 int number_of_new_sync_nodes_created_at_association_; |
| 139 | 139 |
| 140 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); | 140 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); |
| 141 }; | 141 }; |
| 142 | 142 |
| 143 } // namespace browser_sync | 143 } // namespace browser_sync |
| 144 | 144 |
| 145 #endif // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ | 145 #endif // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ |
| OLD | NEW |