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

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

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 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 | « sync/syncable/on_disk_directory_backing_store.cc ('k') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 SYNC_SYNCABLE_SYNCABLE_H_
6 #define CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ 6 #define 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 <cstddef> 11 #include <cstddef>
12 #include <iosfwd> 12 #include <iosfwd>
13 #include <limits> 13 #include <limits>
14 #include <map> 14 #include <map>
15 #include <set> 15 #include <set>
16 #include <string> 16 #include <string>
17 #include <vector> 17 #include <vector>
18 18
19 #include "base/atomicops.h" 19 #include "base/atomicops.h"
20 #include "base/basictypes.h" 20 #include "base/basictypes.h"
21 #include "base/compiler_specific.h" 21 #include "base/compiler_specific.h"
22 #include "base/file_path.h" 22 #include "base/file_path.h"
23 #include "base/gtest_prod_util.h" 23 #include "base/gtest_prod_util.h"
24 #include "base/location.h" 24 #include "base/location.h"
25 #include "base/logging.h" 25 #include "base/logging.h"
26 #include "base/memory/ref_counted.h" 26 #include "base/memory/ref_counted.h"
27 #include "base/synchronization/lock.h" 27 #include "base/synchronization/lock.h"
28 #include "base/time.h" 28 #include "base/time.h"
29 #include "chrome/browser/sync/internal_api/includes/report_unrecoverable_error_f unction.h" 29 #include "sync/syncable/blob.h"
30 #include "chrome/browser/sync/internal_api/includes/unrecoverable_error_handler. h" 30 #include "sync/syncable/dir_open_result.h"
31 #include "chrome/browser/sync/syncable/blob.h" 31 #include "sync/syncable/model_type.h"
32 #include "chrome/browser/sync/syncable/dir_open_result.h" 32 #include "sync/syncable/syncable_id.h"
33 #include "chrome/browser/sync/syncable/model_type.h" 33 #include "sync/util/cryptographer.h"
34 #include "chrome/browser/sync/syncable/syncable_id.h" 34 #include "sync/util/immutable.h"
35 #include "chrome/browser/sync/util/cryptographer.h" 35 #include "sync/util/report_unrecoverable_error_function.h"
36 #include "chrome/browser/sync/util/immutable.h" 36 #include "sync/util/unrecoverable_error_handler.h"
37 #include "chrome/browser/sync/util/time.h" 37 #include "sync/util/time.h"
38 #include "chrome/browser/sync/util/weak_handle.h" 38 #include "sync/util/weak_handle.h"
39 #include "sync/protocol/sync.pb.h" 39 #include "sync/protocol/sync.pb.h"
40 40
41 namespace base { 41 namespace base {
42 class DictionaryValue; 42 class DictionaryValue;
43 class ListValue; 43 class ListValue;
44 } 44 }
45 45
46 namespace browser_sync { 46 namespace browser_sync {
47 class Encryptor; 47 class Encryptor;
48 } // namespace browser_sync 48 } // namespace browser_sync
(...skipping 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1339 1339
1340 bool IsLegalNewParent(BaseTransaction* trans, const Id& id, const Id& parentid); 1340 bool IsLegalNewParent(BaseTransaction* trans, const Id& id, const Id& parentid);
1341 1341
1342 // This function sets only the flags needed to get this entry to sync. 1342 // This function sets only the flags needed to get this entry to sync.
1343 bool MarkForSyncing(syncable::MutableEntry* e); 1343 bool MarkForSyncing(syncable::MutableEntry* e);
1344 1344
1345 } // namespace syncable 1345 } // namespace syncable
1346 1346
1347 std::ostream& operator <<(std::ostream&, const syncable::Blob&); 1347 std::ostream& operator <<(std::ostream&, const syncable::Blob&);
1348 1348
1349 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ 1349 #endif // SYNC_SYNCABLE_SYNCABLE_H_
OLDNEW
« no previous file with comments | « sync/syncable/on_disk_directory_backing_store.cc ('k') | sync/syncable/syncable.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698