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

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

Issue 2844037: Fix handling of undeletion within the syncer. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Whitespace. Created 10 years, 5 months 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <bitset> 9 #include <bitset>
10 #include <iosfwd> 10 #include <iosfwd>
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 DCHECK(kernel_); 415 DCHECK(kernel_);
416 return kernel_->ref(ID).IsRoot(); 416 return kernel_->ref(ID).IsRoot();
417 } 417 }
418 418
419 Directory* dir() const; 419 Directory* dir() const;
420 420
421 const EntryKernel GetKernelCopy() const { 421 const EntryKernel GetKernelCopy() const {
422 return *kernel_; 422 return *kernel_;
423 } 423 }
424 424
425
426 protected: // Don't allow creation on heap, except by sync API wrappers. 425 protected: // Don't allow creation on heap, except by sync API wrappers.
427 friend class sync_api::ReadNode; 426 friend class sync_api::ReadNode;
428 void* operator new(size_t size) { return (::operator new)(size); } 427 void* operator new(size_t size) { return (::operator new)(size); }
429 428
430 inline Entry(BaseTransaction* trans) : basetrans_(trans) { } 429 inline Entry(BaseTransaction* trans) : basetrans_(trans) { }
431 430
432 protected: 431 protected:
433 432
434 BaseTransaction* const basetrans_; 433 BaseTransaction* const basetrans_;
435 434
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 void ZeroFields(EntryKernel* entry, int first_field); 1121 void ZeroFields(EntryKernel* entry, int first_field);
1123 1122
1124 } // namespace syncable 1123 } // namespace syncable
1125 1124
1126 std::ostream& operator <<(std::ostream&, const syncable::Blob&); 1125 std::ostream& operator <<(std::ostream&, const syncable::Blob&);
1127 1126
1128 browser_sync::FastDump& operator << 1127 browser_sync::FastDump& operator <<
1129 (browser_sync::FastDump&, const syncable::Blob&); 1128 (browser_sync::FastDump&, const syncable::Blob&);
1130 1129
1131 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ 1130 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/status_controller.h ('k') | chrome/browser/sync/syncable/syncable.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698