| 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 <set> | 12 #include <set> |
| 13 #include <stack> | 13 #include <stack> |
| 14 #include <string> | 14 #include <string> |
| 15 #include <vector> | 15 #include <vector> |
| 16 | 16 |
| 17 #include "base/compiler_specific.h" | 17 #include "base/compiler_specific.h" |
| 18 #include "base/containers/hash_tables.h" | 18 #include "base/containers/hash_tables.h" |
| 19 #include "base/hash.h" | 19 #include "base/hash.h" |
| 20 #include "base/macros.h" | 20 #include "base/macros.h" |
| 21 #include "base/memory/weak_ptr.h" | 21 #include "base/memory/weak_ptr.h" |
| 22 #include "base/strings/string16.h" | 22 #include "base/strings/string16.h" |
| 23 #include "base/threading/thread_checker.h" | 23 #include "base/threading/thread_checker.h" |
| 24 #include "components/sync/base/unrecoverable_error_handler.h" |
| 25 #include "components/sync/core/data_type_error_handler.h" |
| 24 #include "components/sync_driver/model_associator.h" | 26 #include "components/sync_driver/model_associator.h" |
| 25 #include "sync/internal_api/public/data_type_error_handler.h" | |
| 26 #include "sync/internal_api/public/util/unrecoverable_error_handler.h" | |
| 27 | 27 |
| 28 class GURL; | 28 class GURL; |
| 29 | 29 |
| 30 namespace bookmarks { | 30 namespace bookmarks { |
| 31 class BookmarkModel; | 31 class BookmarkModel; |
| 32 class BookmarkNode; | 32 class BookmarkNode; |
| 33 } | 33 } |
| 34 | 34 |
| 35 namespace syncer { | 35 namespace syncer { |
| 36 class BaseNode; | 36 class BaseNode; |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 // guarantees no invocations can occur if |this| has been deleted. (This | 305 // guarantees no invocations can occur if |this| has been deleted. (This |
| 306 // allows this class to be non-refcounted). | 306 // allows this class to be non-refcounted). |
| 307 base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_; | 307 base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_; |
| 308 | 308 |
| 309 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); | 309 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); |
| 310 }; | 310 }; |
| 311 | 311 |
| 312 } // namespace browser_sync | 312 } // namespace browser_sync |
| 313 | 313 |
| 314 #endif // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_ | 314 #endif // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_ |
| OLD | NEW |