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_CHANGE_PROCESSOR_H_ | 5 #ifndef COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_ |
6 #define COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_ | 6 #define COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
11 #include <set> | 11 #include <set> |
12 #include <vector> | 12 #include <vector> |
13 | 13 |
14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
15 #include "base/macros.h" | 15 #include "base/macros.h" |
16 #include "base/threading/thread_checker.h" | 16 #include "base/threading/thread_checker.h" |
17 #include "components/bookmarks/browser/bookmark_model_observer.h" | 17 #include "components/bookmarks/browser/bookmark_model_observer.h" |
18 #include "components/bookmarks/browser/bookmark_node.h" | 18 #include "components/bookmarks/browser/bookmark_node.h" |
19 #include "components/sync/api/data_type_error_handler.h" | |
20 #include "components/sync/driver/change_processor.h" | 19 #include "components/sync/driver/change_processor.h" |
| 20 #include "components/sync/model/data_type_error_handler.h" |
21 #include "components/sync_bookmarks/bookmark_model_associator.h" | 21 #include "components/sync_bookmarks/bookmark_model_associator.h" |
22 | 22 |
23 class Profile; | 23 class Profile; |
24 | 24 |
25 namespace base { | 25 namespace base { |
26 class RefCountedMemory; | 26 class RefCountedMemory; |
27 } // namespace base | 27 } // namespace base |
28 | 28 |
29 namespace syncer { | 29 namespace syncer { |
30 class SyncClient; | 30 class SyncClient; |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 | 251 |
252 // The two models should be associated according to this ModelAssociator. | 252 // The two models should be associated according to this ModelAssociator. |
253 BookmarkModelAssociator* model_associator_; | 253 BookmarkModelAssociator* model_associator_; |
254 | 254 |
255 DISALLOW_COPY_AND_ASSIGN(BookmarkChangeProcessor); | 255 DISALLOW_COPY_AND_ASSIGN(BookmarkChangeProcessor); |
256 }; | 256 }; |
257 | 257 |
258 } // namespace sync_bookmarks | 258 } // namespace sync_bookmarks |
259 | 259 |
260 #endif // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_ | 260 #endif // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_CHANGE_PROCESSOR_H_ |
OLD | NEW |