| 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 1196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1207 Directory* directory); | 1207 Directory* directory); |
| 1208 | 1208 |
| 1209 void Lock(); | 1209 void Lock(); |
| 1210 void Unlock(); | 1210 void Unlock(); |
| 1211 | 1211 |
| 1212 const tracked_objects::Location from_here_; | 1212 const tracked_objects::Location from_here_; |
| 1213 const char* const name_; | 1213 const char* const name_; |
| 1214 WriterTag writer_; | 1214 WriterTag writer_; |
| 1215 Directory* const directory_; | 1215 Directory* const directory_; |
| 1216 Directory::Kernel* const dirkernel_; // for brevity | 1216 Directory::Kernel* const dirkernel_; // for brevity |
| 1217 base::TimeTicks time_acquired_; | |
| 1218 | 1217 |
| 1219 private: | 1218 private: |
| 1220 DISALLOW_COPY_AND_ASSIGN(BaseTransaction); | 1219 DISALLOW_COPY_AND_ASSIGN(BaseTransaction); |
| 1221 }; | 1220 }; |
| 1222 | 1221 |
| 1223 // Locks db in constructor, unlocks in destructor. | 1222 // Locks db in constructor, unlocks in destructor. |
| 1224 class ReadTransaction : public BaseTransaction { | 1223 class ReadTransaction : public BaseTransaction { |
| 1225 public: | 1224 public: |
| 1226 ReadTransaction(const tracked_objects::Location& from_here, | 1225 ReadTransaction(const tracked_objects::Location& from_here, |
| 1227 Directory* directory); | 1226 Directory* directory); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1274 bool IsLegalNewParent(BaseTransaction* trans, const Id& id, const Id& parentid); | 1273 bool IsLegalNewParent(BaseTransaction* trans, const Id& id, const Id& parentid); |
| 1275 | 1274 |
| 1276 // This function sets only the flags needed to get this entry to sync. | 1275 // This function sets only the flags needed to get this entry to sync. |
| 1277 void MarkForSyncing(syncable::MutableEntry* e); | 1276 void MarkForSyncing(syncable::MutableEntry* e); |
| 1278 | 1277 |
| 1279 } // namespace syncable | 1278 } // namespace syncable |
| 1280 | 1279 |
| 1281 std::ostream& operator <<(std::ostream&, const syncable::Blob&); | 1280 std::ostream& operator <<(std::ostream&, const syncable::Blob&); |
| 1282 | 1281 |
| 1283 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ | 1282 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ |
| OLD | NEW |