OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 entry. | 3 // found in the LICENSE entry. |
4 | 4 |
5 #include "chrome/browser/sync/engine/syncer.h" | 5 #include "chrome/browser/sync/engine/syncer.h" |
6 | 6 |
7 #include "base/format_macros.h" | 7 #include "base/format_macros.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "chrome/browser/chrome_thread.h" | 9 #include "chrome/browser/chrome_thread.h" |
10 #include "chrome/browser/sync/engine/apply_updates_command.h" | 10 #include "chrome/browser/sync/engine/apply_updates_command.h" |
11 #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h" | 11 #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h" |
12 #include "chrome/browser/sync/engine/build_commit_command.h" | 12 #include "chrome/browser/sync/engine/build_commit_command.h" |
13 #include "chrome/browser/sync/engine/conflict_resolver.h" | 13 #include "chrome/browser/sync/engine/conflict_resolver.h" |
14 #include "chrome/browser/sync/engine/download_updates_command.h" | 14 #include "chrome/browser/sync/engine/download_updates_command.h" |
15 #include "chrome/browser/sync/engine/get_commit_ids_command.h" | 15 #include "chrome/browser/sync/engine/get_commit_ids_command.h" |
16 #include "chrome/browser/sync/engine/net/server_connection_manager.h" | 16 #include "chrome/browser/sync/engine/net/server_connection_manager.h" |
17 #include "chrome/browser/sync/engine/post_commit_message_command.h" | 17 #include "chrome/browser/sync/engine/post_commit_message_command.h" |
18 #include "chrome/browser/sync/engine/process_commit_response_command.h" | 18 #include "chrome/browser/sync/engine/process_commit_response_command.h" |
19 #include "chrome/browser/sync/engine/process_updates_command.h" | 19 #include "chrome/browser/sync/engine/process_updates_command.h" |
20 #include "chrome/browser/sync/engine/resolve_conflicts_command.h" | 20 #include "chrome/browser/sync/engine/resolve_conflicts_command.h" |
21 #include "chrome/browser/sync/engine/syncer_end_command.h" | 21 #include "chrome/browser/sync/engine/syncer_end_command.h" |
22 #include "chrome/browser/sync/engine/syncer_types.h" | 22 #include "chrome/browser/sync/engine/syncer_types.h" |
23 #include "chrome/browser/sync/engine/syncer_util.h" | 23 #include "chrome/browser/sync/engine/syncer_util.h" |
24 #include "chrome/browser/sync/engine/syncproto.h" | 24 #include "chrome/browser/sync/engine/syncproto.h" |
25 #include "chrome/browser/sync/engine/verify_updates_command.h" | 25 #include "chrome/browser/sync/engine/verify_updates_command.h" |
26 #include "chrome/browser/sync/syncable/directory_manager.h" | 26 #include "chrome/browser/sync/syncable/directory_manager.h" |
27 #include "chrome/browser/sync/syncable/syncable-inl.h" | 27 #include "chrome/browser/sync/syncable/syncable-inl.h" |
28 #include "chrome/browser/sync/syncable/syncable.h" | 28 #include "chrome/browser/sync/syncable/syncable.h" |
29 #include "chrome/browser/sync/util/character_set_converters.h" | |
30 | 29 |
31 using sync_pb::ClientCommand; | 30 using sync_pb::ClientCommand; |
32 using syncable::Blob; | 31 using syncable::Blob; |
33 using syncable::IS_UNAPPLIED_UPDATE; | 32 using syncable::IS_UNAPPLIED_UPDATE; |
34 using syncable::SERVER_BOOKMARK_FAVICON; | 33 using syncable::SERVER_BOOKMARK_FAVICON; |
35 using syncable::SERVER_BOOKMARK_URL; | 34 using syncable::SERVER_BOOKMARK_URL; |
36 using syncable::SERVER_CTIME; | 35 using syncable::SERVER_CTIME; |
37 using syncable::SERVER_IS_BOOKMARK_OBJECT; | 36 using syncable::SERVER_IS_BOOKMARK_OBJECT; |
38 using syncable::SERVER_IS_DEL; | 37 using syncable::SERVER_IS_DEL; |
39 using syncable::SERVER_IS_DIR; | 38 using syncable::SERVER_IS_DIR; |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 entry.id_string().c_str(), | 353 entry.id_string().c_str(), |
355 entry.parent_id_string().c_str(), | 354 entry.parent_id_string().c_str(), |
356 entry.version(), | 355 entry.version(), |
357 entry.mtime(), ServerTimeToClientTime(entry.mtime()), | 356 entry.mtime(), ServerTimeToClientTime(entry.mtime()), |
358 entry.ctime(), ServerTimeToClientTime(entry.ctime()), | 357 entry.ctime(), ServerTimeToClientTime(entry.ctime()), |
359 entry.name().c_str(), entry.sync_timestamp(), | 358 entry.name().c_str(), entry.sync_timestamp(), |
360 entry.deleted() ? "deleted, ":""); | 359 entry.deleted() ? "deleted, ":""); |
361 } | 360 } |
362 | 361 |
363 } // namespace browser_sync | 362 } // namespace browser_sync |
OLD | NEW |