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

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

Issue 7879006: Delete Tracked, and move Location to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed Tracked, and put Location into location.h Created 9 years, 3 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 | 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>
11 #include <iosfwd> 11 #include <iosfwd>
12 #include <limits> 12 #include <limits>
13 #include <set> 13 #include <set>
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "base/atomicops.h" 17 #include "base/atomicops.h"
18 #include "base/basictypes.h" 18 #include "base/basictypes.h"
19 #include "base/file_path.h" 19 #include "base/file_path.h"
20 #include "base/gtest_prod_util.h" 20 #include "base/gtest_prod_util.h"
21 #include "base/location.h"
21 #include "base/logging.h" 22 #include "base/logging.h"
22 #include "base/memory/ref_counted.h" 23 #include "base/memory/ref_counted.h"
23 #include "base/observer_list_threadsafe.h" 24 #include "base/observer_list_threadsafe.h"
24 #include "base/synchronization/lock.h" 25 #include "base/synchronization/lock.h"
25 #include "base/time.h" 26 #include "base/time.h"
26 #include "base/tracked.h"
27 #include "chrome/browser/sync/protocol/sync.pb.h" 27 #include "chrome/browser/sync/protocol/sync.pb.h"
28 #include "chrome/browser/sync/syncable/blob.h" 28 #include "chrome/browser/sync/syncable/blob.h"
29 #include "chrome/browser/sync/syncable/dir_open_result.h" 29 #include "chrome/browser/sync/syncable/dir_open_result.h"
30 #include "chrome/browser/sync/syncable/directory_event.h" 30 #include "chrome/browser/sync/syncable/directory_event.h"
31 #include "chrome/browser/sync/syncable/syncable_id.h" 31 #include "chrome/browser/sync/syncable/syncable_id.h"
32 #include "chrome/browser/sync/syncable/model_type.h" 32 #include "chrome/browser/sync/syncable/model_type.h"
33 #include "chrome/browser/sync/util/dbgq.h" 33 #include "chrome/browser/sync/util/dbgq.h"
34 34
35 struct PurgeInfo; 35 struct PurgeInfo;
36 36
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 Id ComputePrevIdFromServerPosition(const Id& parent_id) const; 436 Id ComputePrevIdFromServerPosition(const Id& parent_id) const;
437 437
438 // Dumps all entry info into a DictionaryValue and returns it. 438 // Dumps all entry info into a DictionaryValue and returns it.
439 // Transfers ownership of the DictionaryValue to the caller. 439 // Transfers ownership of the DictionaryValue to the caller.
440 base::DictionaryValue* ToValue() const; 440 base::DictionaryValue* ToValue() const;
441 441
442 protected: // Don't allow creation on heap, except by sync API wrappers. 442 protected: // Don't allow creation on heap, except by sync API wrappers.
443 friend class sync_api::ReadNode; 443 friend class sync_api::ReadNode;
444 void* operator new(size_t size) { return (::operator new)(size); } 444 void* operator new(size_t size) { return (::operator new)(size); }
445 445
446 inline Entry(BaseTransaction* trans) 446 inline explicit Entry(BaseTransaction* trans)
447 : basetrans_(trans), 447 : basetrans_(trans),
448 kernel_(NULL) { } 448 kernel_(NULL) { }
449 449
450 protected: 450 protected:
451 451
452 BaseTransaction* const basetrans_; 452 BaseTransaction* const basetrans_;
453 453
454 EntryKernel* kernel_; 454 EntryKernel* kernel_;
455 455
456 private: 456 private:
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 1190
1191 // This is not a reset. It just sets the numeric fields which are not 1191 // This is not a reset. It just sets the numeric fields which are not
1192 // initialized by the constructor to zero. 1192 // initialized by the constructor to zero.
1193 void ZeroFields(EntryKernel* entry, int first_field); 1193 void ZeroFields(EntryKernel* entry, int first_field);
1194 1194
1195 } // namespace syncable 1195 } // namespace syncable
1196 1196
1197 std::ostream& operator <<(std::ostream&, const syncable::Blob&); 1197 std::ostream& operator <<(std::ostream&, const syncable::Blob&);
1198 1198
1199 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ 1199 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698