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

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: rebased 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
« no previous file with comments | « chrome/browser/sync/sync_js_controller.cc ('k') | chrome/browser/sync/syncable/syncable.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <map> 13 #include <map>
14 #include <set> 14 #include <set>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 #include "base/atomicops.h" 18 #include "base/atomicops.h"
19 #include "base/basictypes.h" 19 #include "base/basictypes.h"
20 #include "base/file_path.h" 20 #include "base/file_path.h"
21 #include "base/gtest_prod_util.h" 21 #include "base/gtest_prod_util.h"
22 #include "base/location.h"
22 #include "base/logging.h" 23 #include "base/logging.h"
23 #include "base/memory/ref_counted.h" 24 #include "base/memory/ref_counted.h"
24 #include "base/observer_list_threadsafe.h" 25 #include "base/observer_list_threadsafe.h"
25 #include "base/synchronization/lock.h" 26 #include "base/synchronization/lock.h"
26 #include "base/time.h" 27 #include "base/time.h"
27 #include "base/tracked.h"
28 #include "chrome/browser/sync/protocol/sync.pb.h" 28 #include "chrome/browser/sync/protocol/sync.pb.h"
29 #include "chrome/browser/sync/syncable/blob.h" 29 #include "chrome/browser/sync/syncable/blob.h"
30 #include "chrome/browser/sync/syncable/dir_open_result.h" 30 #include "chrome/browser/sync/syncable/dir_open_result.h"
31 #include "chrome/browser/sync/syncable/directory_event.h" 31 #include "chrome/browser/sync/syncable/directory_event.h"
32 #include "chrome/browser/sync/syncable/syncable_id.h" 32 #include "chrome/browser/sync/syncable/syncable_id.h"
33 #include "chrome/browser/sync/syncable/model_type.h" 33 #include "chrome/browser/sync/syncable/model_type.h"
34 #include "chrome/browser/sync/util/dbgq.h" 34 #include "chrome/browser/sync/util/dbgq.h"
35 #include "chrome/browser/sync/util/immutable.h" 35 #include "chrome/browser/sync/util/immutable.h"
36 36
37 struct PurgeInfo; 37 struct PurgeInfo;
(...skipping 1152 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
« no previous file with comments | « chrome/browser/sync/sync_js_controller.cc ('k') | chrome/browser/sync/syncable/syncable.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698