| 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 "components/sync_bookmarks/bookmark_model_associator.h" | 5 #include "components/sync_bookmarks/bookmark_model_associator.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 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/format_macros.h" | 11 #include "base/format_macros.h" |
| 12 #include "base/location.h" | 12 #include "base/location.h" |
| 13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
| 14 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
| 15 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
| 16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
| 17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
| 18 #include "base/threading/thread_task_runner_handle.h" | 18 #include "base/threading/thread_task_runner_handle.h" |
| 19 #include "components/bookmarks/browser/bookmark_client.h" | 19 #include "components/bookmarks/browser/bookmark_client.h" |
| 20 #include "components/bookmarks/browser/bookmark_model.h" | 20 #include "components/bookmarks/browser/bookmark_model.h" |
| 21 #include "components/sync/base/cryptographer.h" | 21 #include "components/sync/base/cryptographer.h" |
| 22 #include "components/sync/base/data_type_histogram.h" | 22 #include "components/sync/base/data_type_histogram.h" |
| 23 #include "components/sync/core/delete_journal.h" | |
| 24 #include "components/sync/core/read_node.h" | |
| 25 #include "components/sync/core/read_transaction.h" | |
| 26 #include "components/sync/core/write_node.h" | |
| 27 #include "components/sync/core/write_transaction.h" | |
| 28 #include "components/sync/core_impl/syncapi_internal.h" | 23 #include "components/sync/core_impl/syncapi_internal.h" |
| 29 #include "components/sync/driver/sync_client.h" | 24 #include "components/sync/driver/sync_client.h" |
| 30 #include "components/sync/model/sync_error.h" | 25 #include "components/sync/model/sync_error.h" |
| 31 #include "components/sync/model/sync_merge_result.h" | 26 #include "components/sync/model/sync_merge_result.h" |
| 27 #include "components/sync/syncable/delete_journal.h" |
| 32 #include "components/sync/syncable/entry.h" | 28 #include "components/sync/syncable/entry.h" |
| 29 #include "components/sync/syncable/read_node.h" |
| 30 #include "components/sync/syncable/read_transaction.h" |
| 33 #include "components/sync/syncable/syncable_write_transaction.h" | 31 #include "components/sync/syncable/syncable_write_transaction.h" |
| 32 #include "components/sync/syncable/write_node.h" |
| 33 #include "components/sync/syncable/write_transaction.h" |
| 34 #include "components/sync_bookmarks/bookmark_change_processor.h" | 34 #include "components/sync_bookmarks/bookmark_change_processor.h" |
| 35 #include "components/undo/bookmark_undo_service.h" | 35 #include "components/undo/bookmark_undo_service.h" |
| 36 #include "components/undo/bookmark_undo_utils.h" | 36 #include "components/undo/bookmark_undo_utils.h" |
| 37 | 37 |
| 38 using bookmarks::BookmarkModel; | 38 using bookmarks::BookmarkModel; |
| 39 using bookmarks::BookmarkNode; | 39 using bookmarks::BookmarkNode; |
| 40 | 40 |
| 41 namespace sync_bookmarks { | 41 namespace sync_bookmarks { |
| 42 | 42 |
| 43 // The sync protocol identifies top-level entities by means of well-known tags, | 43 // The sync protocol identifies top-level entities by means of well-known tags, |
| (...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1007 syncer::BOOKMARKS); | 1007 syncer::BOOKMARKS); |
| 1008 } else { | 1008 } else { |
| 1009 context->set_native_model_sync_state(BEHIND); | 1009 context->set_native_model_sync_state(BEHIND); |
| 1010 } | 1010 } |
| 1011 } | 1011 } |
| 1012 } | 1012 } |
| 1013 return syncer::SyncError(); | 1013 return syncer::SyncError(); |
| 1014 } | 1014 } |
| 1015 | 1015 |
| 1016 } // namespace sync_bookmarks | 1016 } // namespace sync_bookmarks |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2407163004:
[Sync] Move some directory-related things from core/ to syncable/. (Closed)
