OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #ifndef COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_ | 5 #ifndef COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_ |
6 #define COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_ | 6 #define COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
11 #include <map> | 11 #include <map> |
12 #include <memory> | 12 #include <memory> |
13 #include <set> | 13 #include <set> |
14 #include <stack> | 14 #include <stack> |
15 #include <string> | 15 #include <string> |
16 #include <vector> | 16 #include <vector> |
17 | 17 |
18 #include "base/compiler_specific.h" | 18 #include "base/compiler_specific.h" |
19 #include "base/containers/hash_tables.h" | 19 #include "base/containers/hash_tables.h" |
20 #include "base/hash.h" | 20 #include "base/hash.h" |
21 #include "base/macros.h" | 21 #include "base/macros.h" |
22 #include "base/memory/weak_ptr.h" | 22 #include "base/memory/weak_ptr.h" |
23 #include "base/strings/string16.h" | 23 #include "base/strings/string16.h" |
24 #include "base/threading/thread_checker.h" | 24 #include "base/threading/thread_checker.h" |
25 #include "components/sync/api/data_type_error_handler.h" | |
26 #include "components/sync/base/unrecoverable_error_handler.h" | 25 #include "components/sync/base/unrecoverable_error_handler.h" |
27 #include "components/sync/driver/model_associator.h" | 26 #include "components/sync/driver/model_associator.h" |
| 27 #include "components/sync/model/data_type_error_handler.h" |
28 | 28 |
29 class GURL; | 29 class GURL; |
30 | 30 |
31 namespace bookmarks { | 31 namespace bookmarks { |
32 class BookmarkModel; | 32 class BookmarkModel; |
33 class BookmarkNode; | 33 class BookmarkNode; |
34 } | 34 } |
35 | 35 |
36 namespace syncer { | 36 namespace syncer { |
37 class BaseNode; | 37 class BaseNode; |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
303 // guarantees no invocations can occur if |this| has been deleted. (This | 303 // guarantees no invocations can occur if |this| has been deleted. (This |
304 // allows this class to be non-refcounted). | 304 // allows this class to be non-refcounted). |
305 base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_; | 305 base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_; |
306 | 306 |
307 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); | 307 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); |
308 }; | 308 }; |
309 | 309 |
310 } // namespace sync_bookmarks | 310 } // namespace sync_bookmarks |
311 | 311 |
312 #endif // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_ | 312 #endif // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_ |
OLD | NEW |