| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/engine_impl/commit_util.h" | 5 #include "components/sync/engine_impl/commit_util.h" |
| 6 | 6 |
| 7 #include <stdint.h> | |
| 8 | |
| 9 #include <limits> | 7 #include <limits> |
| 10 #include <set> | |
| 11 #include <string> | 8 #include <string> |
| 12 #include <vector> | 9 #include <vector> |
| 13 | 10 |
| 14 #include "base/debug/dump_without_crashing.h" | 11 #include "base/debug/dump_without_crashing.h" |
| 15 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 16 #include "components/sync/base/attachment_id_proto.h" | 13 #include "components/sync/base/attachment_id_proto.h" |
| 17 #include "components/sync/base/time.h" | 14 #include "components/sync/base/time.h" |
| 18 #include "components/sync/base/unique_position.h" | 15 #include "components/sync/base/unique_position.h" |
| 19 #include "components/sync/engine_impl/syncer_proto_util.h" | 16 #include "components/sync/engine_impl/syncer_proto_util.h" |
| 20 #include "components/sync/protocol/bookmark_specifics.pb.h" | 17 #include "components/sync/protocol/bookmark_specifics.pb.h" |
| 21 #include "components/sync/protocol/sync.pb.h" | |
| 22 #include "components/sync/syncable/directory.h" | 18 #include "components/sync/syncable/directory.h" |
| 23 #include "components/sync/syncable/entry.h" | 19 #include "components/sync/syncable/entry.h" |
| 24 #include "components/sync/syncable/model_neutral_mutable_entry.h" | 20 #include "components/sync/syncable/model_neutral_mutable_entry.h" |
| 25 #include "components/sync/syncable/syncable_base_transaction.h" | 21 #include "components/sync/syncable/syncable_base_transaction.h" |
| 26 #include "components/sync/syncable/syncable_base_write_transaction.h" | 22 #include "components/sync/syncable/syncable_base_write_transaction.h" |
| 27 #include "components/sync/syncable/syncable_changes_version.h" | 23 #include "components/sync/syncable/syncable_changes_version.h" |
| 28 #include "components/sync/syncable/syncable_proto_util.h" | 24 #include "components/sync/syncable/syncable_proto_util.h" |
| 29 #include "components/sync/syncable/syncable_util.h" | 25 #include "components/sync/syncable/syncable_util.h" |
| 30 | 26 |
| 31 using std::set; | 27 using std::set; |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 | 447 |
| 452 ProcessSuccessfulCommitResponse(commit_request_entry, server_entry, | 448 ProcessSuccessfulCommitResponse(commit_request_entry, server_entry, |
| 453 local_entry.GetId(), &local_entry, | 449 local_entry.GetId(), &local_entry, |
| 454 dirty_sync_was_set, deleted_folders); | 450 dirty_sync_was_set, deleted_folders); |
| 455 return response; | 451 return response; |
| 456 } | 452 } |
| 457 | 453 |
| 458 } // namespace commit_util | 454 } // namespace commit_util |
| 459 | 455 |
| 460 } // namespace syncer | 456 } // namespace syncer |
| OLD | NEW |