OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #include "chrome/browser/sync/glue/bookmark_model_associator.h" | 5 #include "chrome/browser/sync/glue/bookmark_model_associator.h" |
6 | 6 |
7 #include <stack> | 7 #include <stack> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/containers/hash_tables.h" | 11 #include "base/containers/hash_tables.h" |
12 #include "base/format_macros.h" | 12 #include "base/format_macros.h" |
13 #include "base/location.h" | 13 #include "base/location.h" |
14 #include "base/macros.h" | 14 #include "base/macros.h" |
15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
16 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
17 #include "base/strings/string_util.h" | 17 #include "base/strings/string_util.h" |
18 #include "base/strings/stringprintf.h" | 18 #include "base/strings/stringprintf.h" |
19 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
20 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
21 #include "chrome/browser/sync/glue/bookmark_change_processor.h" | 21 #include "chrome/browser/sync/glue/bookmark_change_processor.h" |
22 #include "chrome/browser/undo/bookmark_undo_service.h" | |
23 #include "chrome/browser/undo/bookmark_undo_service_factory.h" | 22 #include "chrome/browser/undo/bookmark_undo_service_factory.h" |
24 #include "chrome/browser/undo/bookmark_undo_utils.h" | |
25 #include "components/bookmarks/browser/bookmark_client.h" | 23 #include "components/bookmarks/browser/bookmark_client.h" |
26 #include "components/bookmarks/browser/bookmark_model.h" | 24 #include "components/bookmarks/browser/bookmark_model.h" |
| 25 #include "components/undo/bookmark_undo_service.h" |
| 26 #include "components/undo/bookmark_undo_utils.h" |
27 #include "content/public/browser/browser_thread.h" | 27 #include "content/public/browser/browser_thread.h" |
28 #include "sync/api/sync_error.h" | 28 #include "sync/api/sync_error.h" |
29 #include "sync/internal_api/public/delete_journal.h" | 29 #include "sync/internal_api/public/delete_journal.h" |
30 #include "sync/internal_api/public/read_node.h" | 30 #include "sync/internal_api/public/read_node.h" |
31 #include "sync/internal_api/public/read_transaction.h" | 31 #include "sync/internal_api/public/read_transaction.h" |
32 #include "sync/internal_api/public/write_node.h" | 32 #include "sync/internal_api/public/write_node.h" |
33 #include "sync/internal_api/public/write_transaction.h" | 33 #include "sync/internal_api/public/write_transaction.h" |
34 #include "sync/internal_api/syncapi_internal.h" | 34 #include "sync/internal_api/syncapi_internal.h" |
35 #include "sync/syncable/syncable_write_transaction.h" | 35 #include "sync/syncable/syncable_write_transaction.h" |
36 #include "sync/util/cryptographer.h" | 36 #include "sync/util/cryptographer.h" |
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
835 syncer::SyncError::PERSISTENCE_ERROR, | 835 syncer::SyncError::PERSISTENCE_ERROR, |
836 message, | 836 message, |
837 syncer::BOOKMARKS); | 837 syncer::BOOKMARKS); |
838 } | 838 } |
839 } | 839 } |
840 } | 840 } |
841 return syncer::SyncError(); | 841 return syncer::SyncError(); |
842 } | 842 } |
843 | 843 |
844 } // namespace browser_sync | 844 } // namespace browser_sync |
OLD | NEW |