OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ | 5 #ifndef CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ |
6 #define CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ | 6 #define CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <bitset> | 10 #include <bitset> |
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
620 tracked_objects::Location location, | 620 tracked_objects::Location location, |
621 WriterTag writer, | 621 WriterTag writer, |
622 ImmutableEntryKernelMutationMap mutations); | 622 ImmutableEntryKernelMutationMap mutations); |
623 WriteTransactionInfo(); | 623 WriteTransactionInfo(); |
624 ~WriteTransactionInfo(); | 624 ~WriteTransactionInfo(); |
625 | 625 |
626 // Caller owns the return value. | 626 // Caller owns the return value. |
627 base::DictionaryValue* ToValue(size_t max_mutations_size) const; | 627 base::DictionaryValue* ToValue(size_t max_mutations_size) const; |
628 | 628 |
629 int64 id; | 629 int64 id; |
630 // TODO(akalin): Use Location when it becomes assignable. | 630 // If tracked_objects::Location becomes assignable, we can use that |
| 631 // instead. |
631 std::string location_string; | 632 std::string location_string; |
632 WriterTag writer; | 633 WriterTag writer; |
633 ImmutableEntryKernelMutationMap mutations; | 634 ImmutableEntryKernelMutationMap mutations; |
634 }; | 635 }; |
635 | 636 |
636 typedef | 637 typedef |
637 browser_sync::Immutable<WriteTransactionInfo> | 638 browser_sync::Immutable<WriteTransactionInfo> |
638 ImmutableWriteTransactionInfo; | 639 ImmutableWriteTransactionInfo; |
639 | 640 |
640 // Caller owns the return value. | 641 // Caller owns the return value. |
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1246 bool IsLegalNewParent(BaseTransaction* trans, const Id& id, const Id& parentid); | 1247 bool IsLegalNewParent(BaseTransaction* trans, const Id& id, const Id& parentid); |
1247 | 1248 |
1248 // This function sets only the flags needed to get this entry to sync. | 1249 // This function sets only the flags needed to get this entry to sync. |
1249 void MarkForSyncing(syncable::MutableEntry* e); | 1250 void MarkForSyncing(syncable::MutableEntry* e); |
1250 | 1251 |
1251 } // namespace syncable | 1252 } // namespace syncable |
1252 | 1253 |
1253 std::ostream& operator <<(std::ostream&, const syncable::Blob&); | 1254 std::ostream& operator <<(std::ostream&, const syncable::Blob&); |
1254 | 1255 |
1255 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ | 1256 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ |
OLD | NEW |