Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: chrome/browser/sync/syncable/syncable.h

Issue 8573011: Event tracing for sync events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to trunk to resolve conflicts Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 Directory* directory); 1199 Directory* directory);
1200 1200
1201 void Lock(); 1201 void Lock();
1202 void Unlock(); 1202 void Unlock();
1203 1203
1204 const tracked_objects::Location from_here_; 1204 const tracked_objects::Location from_here_;
1205 const char* const name_; 1205 const char* const name_;
1206 WriterTag writer_; 1206 WriterTag writer_;
1207 Directory* const directory_; 1207 Directory* const directory_;
1208 Directory::Kernel* const dirkernel_; // for brevity 1208 Directory::Kernel* const dirkernel_; // for brevity
1209 base::TimeTicks time_acquired_;
1210 1209
1211 private: 1210 private:
1212 DISALLOW_COPY_AND_ASSIGN(BaseTransaction); 1211 DISALLOW_COPY_AND_ASSIGN(BaseTransaction);
1213 }; 1212 };
1214 1213
1215 // Locks db in constructor, unlocks in destructor. 1214 // Locks db in constructor, unlocks in destructor.
1216 class ReadTransaction : public BaseTransaction { 1215 class ReadTransaction : public BaseTransaction {
1217 public: 1216 public:
1218 ReadTransaction(const tracked_objects::Location& from_here, 1217 ReadTransaction(const tracked_objects::Location& from_here,
1219 Directory* directory); 1218 Directory* directory);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
1266 bool IsLegalNewParent(BaseTransaction* trans, const Id& id, const Id& parentid); 1265 bool IsLegalNewParent(BaseTransaction* trans, const Id& id, const Id& parentid);
1267 1266
1268 // This function sets only the flags needed to get this entry to sync. 1267 // This function sets only the flags needed to get this entry to sync.
1269 void MarkForSyncing(syncable::MutableEntry* e); 1268 void MarkForSyncing(syncable::MutableEntry* e);
1270 1269
1271 } // namespace syncable 1270 } // namespace syncable
1272 1271
1273 std::ostream& operator <<(std::ostream&, const syncable::Blob&); 1272 std::ostream& operator <<(std::ostream&, const syncable::Blob&);
1274 1273
1275 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ 1274 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698