| 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 "sync/syncable/directory.h" | 5 #include "sync/syncable/directory.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| 11 #include "base/debug/trace_event.h" | |
| 12 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
| 13 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 13 #include "base/trace_event/trace_event.h" |
| 14 #include "sync/internal_api/public/base/attachment_id_proto.h" | 14 #include "sync/internal_api/public/base/attachment_id_proto.h" |
| 15 #include "sync/internal_api/public/base/unique_position.h" | 15 #include "sync/internal_api/public/base/unique_position.h" |
| 16 #include "sync/internal_api/public/util/unrecoverable_error_handler.h" | 16 #include "sync/internal_api/public/util/unrecoverable_error_handler.h" |
| 17 #include "sync/syncable/entry.h" | 17 #include "sync/syncable/entry.h" |
| 18 #include "sync/syncable/entry_kernel.h" | 18 #include "sync/syncable/entry_kernel.h" |
| 19 #include "sync/syncable/in_memory_directory_backing_store.h" | 19 #include "sync/syncable/in_memory_directory_backing_store.h" |
| 20 #include "sync/syncable/on_disk_directory_backing_store.h" | 20 #include "sync/syncable/on_disk_directory_backing_store.h" |
| 21 #include "sync/syncable/scoped_kernel_lock.h" | 21 #include "sync/syncable/scoped_kernel_lock.h" |
| 22 #include "sync/syncable/scoped_parent_child_index_updater.h" | 22 #include "sync/syncable/scoped_parent_child_index_updater.h" |
| 23 #include "sync/syncable/syncable-inl.h" | 23 #include "sync/syncable/syncable-inl.h" |
| (...skipping 1498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1522 // TODO(maniscalco): Eliminate redundant metadata storage (bug 415203). | 1522 // TODO(maniscalco): Eliminate redundant metadata storage (bug 415203). |
| 1523 std::set_difference(not_on_server_id_set.begin(), | 1523 std::set_difference(not_on_server_id_set.begin(), |
| 1524 not_on_server_id_set.end(), | 1524 not_on_server_id_set.end(), |
| 1525 on_server_id_set.begin(), | 1525 on_server_id_set.begin(), |
| 1526 on_server_id_set.end(), | 1526 on_server_id_set.end(), |
| 1527 std::inserter(*id_set, id_set->end())); | 1527 std::inserter(*id_set, id_set->end())); |
| 1528 } | 1528 } |
| 1529 | 1529 |
| 1530 } // namespace syncable | 1530 } // namespace syncable |
| 1531 } // namespace syncer | 1531 } // namespace syncer |
| OLD | NEW |