| 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 <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <stack> | 10 #include <stack> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/basictypes.h" | 14 #include "base/basictypes.h" |
| 15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 16 #include "base/hash.h" | 16 #include "base/hash.h" |
| 17 #include "base/memory/weak_ptr.h" | 17 #include "base/memory/weak_ptr.h" |
| 18 #include "base/strings/string16.h" |
| 18 #include "base/threading/thread_checker.h" | 19 #include "base/threading/thread_checker.h" |
| 19 #include "components/sync_driver/data_type_error_handler.h" | 20 #include "components/sync_driver/data_type_error_handler.h" |
| 20 #include "components/sync_driver/model_associator.h" | 21 #include "components/sync_driver/model_associator.h" |
| 21 #include "sync/internal_api/public/util/unrecoverable_error_handler.h" | 22 #include "sync/internal_api/public/util/unrecoverable_error_handler.h" |
| 22 | 23 |
| 23 class GURL; | 24 class GURL; |
| 24 | 25 |
| 25 namespace bookmarks { | 26 namespace bookmarks { |
| 26 class BookmarkModel; | 27 class BookmarkModel; |
| 27 class BookmarkNode; | 28 class BookmarkNode; |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 // guarantees no invocations can occur if |this| has been deleted. (This | 317 // guarantees no invocations can occur if |this| has been deleted. (This |
| 317 // allows this class to be non-refcounted). | 318 // allows this class to be non-refcounted). |
| 318 base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_; | 319 base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_; |
| 319 | 320 |
| 320 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); | 321 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); |
| 321 }; | 322 }; |
| 322 | 323 |
| 323 } // namespace browser_sync | 324 } // namespace browser_sync |
| 324 | 325 |
| 325 #endif // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_ | 326 #endif // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_ |
| OLD | NEW |