| 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 #ifndef COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_ | 5 #ifndef COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_ |
| 6 #define COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_ | 6 #define COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 EntryKernelSet; | 393 EntryKernelSet; |
| 394 | 394 |
| 395 struct EntryKernelMutation { | 395 struct EntryKernelMutation { |
| 396 EntryKernel original, mutated; | 396 EntryKernel original, mutated; |
| 397 }; | 397 }; |
| 398 | 398 |
| 399 typedef std::map<int64_t, EntryKernelMutation> EntryKernelMutationMap; | 399 typedef std::map<int64_t, EntryKernelMutation> EntryKernelMutationMap; |
| 400 | 400 |
| 401 typedef Immutable<EntryKernelMutationMap> ImmutableEntryKernelMutationMap; | 401 typedef Immutable<EntryKernelMutationMap> ImmutableEntryKernelMutationMap; |
| 402 | 402 |
| 403 // Caller owns the return value. | 403 std::unique_ptr<base::DictionaryValue> EntryKernelMutationToValue( |
| 404 base::DictionaryValue* EntryKernelMutationToValue( | |
| 405 const EntryKernelMutation& mutation); | 404 const EntryKernelMutation& mutation); |
| 406 | 405 |
| 407 // Caller owns the return value. | 406 std::unique_ptr<base::ListValue> EntryKernelMutationMapToValue( |
| 408 base::ListValue* EntryKernelMutationMapToValue( | |
| 409 const EntryKernelMutationMap& mutations); | 407 const EntryKernelMutationMap& mutations); |
| 410 | 408 |
| 411 std::ostream& operator<<(std::ostream& os, const EntryKernel& entry_kernel); | 409 std::ostream& operator<<(std::ostream& os, const EntryKernel& entry_kernel); |
| 412 | 410 |
| 413 } // namespace syncable | 411 } // namespace syncable |
| 414 } // namespace syncer | 412 } // namespace syncer |
| 415 | 413 |
| 416 #endif // COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_ | 414 #endif // COMPONENTS_SYNC_SYNCABLE_ENTRY_KERNEL_H_ |
| OLD | NEW |