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

Side by Side Diff: sync/syncable/directory.cc

Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head Created 8 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 | Annotate | Revision Log
« no previous file with comments | « sync/syncable/directory.h ('k') | sync/syncable/directory_backing_store.h » ('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 #include "sync/syncable/directory.h" 5 #include "sync/syncable/directory.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/perftimer.h" 8 #include "base/perftimer.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "sync/internal_api/public/util/unrecoverable_error_handler.h" 11 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
12 #include "sync/syncable/base_transaction.h" 12 #include "sync/syncable/base_transaction.h"
13 #include "sync/syncable/entry.h" 13 #include "sync/syncable/entry.h"
14 #include "sync/syncable/entry_kernel.h" 14 #include "sync/syncable/entry_kernel.h"
15 #include "sync/syncable/in_memory_directory_backing_store.h" 15 #include "sync/syncable/in_memory_directory_backing_store.h"
16 #include "sync/syncable/on_disk_directory_backing_store.h" 16 #include "sync/syncable/on_disk_directory_backing_store.h"
17 #include "sync/syncable/read_transaction.h" 17 #include "sync/syncable/read_transaction.h"
18 #include "sync/syncable/scoped_index_updater.h" 18 #include "sync/syncable/scoped_index_updater.h"
19 #include "sync/syncable/syncable-inl.h" 19 #include "sync/syncable/syncable-inl.h"
20 #include "sync/syncable/syncable_changes_version.h" 20 #include "sync/syncable/syncable_changes_version.h"
21 #include "sync/syncable/syncable_util.h" 21 #include "sync/syncable/syncable_util.h"
22 #include "sync/syncable/write_transaction.h" 22 #include "sync/syncable/write_transaction.h"
23 23
24 using syncer::Encryptor;
25 using syncer::ReportUnrecoverableErrorFunction;
26 using syncer::UnrecoverableErrorHandler;
27 using std::string; 24 using std::string;
28 25
26 namespace syncer {
29 namespace syncable { 27 namespace syncable {
30 28
31 namespace { 29 namespace {
32 // Helper function to add an item to the index, if it ought to be added. 30 // Helper function to add an item to the index, if it ought to be added.
33 template<typename Indexer> 31 template<typename Indexer>
34 void InitializeIndexEntry(EntryKernel* entry, 32 void InitializeIndexEntry(EntryKernel* entry,
35 typename Index<Indexer>::Set* index) { 33 typename Index<Indexer>::Set* index) {
36 if (Indexer::ShouldInclude(entry)) { 34 if (Indexer::ShouldInclude(entry)) {
37 index->insert(entry); 35 index->insert(entry);
38 } 36 }
(...skipping 1247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1286 } 1284 }
1287 } 1285 }
1288 // There were no children in the linked list. 1286 // There were no children in the linked list.
1289 return NULL; 1287 return NULL;
1290 } 1288 }
1291 1289
1292 ScopedKernelLock::ScopedKernelLock(const Directory* dir) 1290 ScopedKernelLock::ScopedKernelLock(const Directory* dir)
1293 : scoped_lock_(dir->kernel_->mutex), dir_(const_cast<Directory*>(dir)) { 1291 : scoped_lock_(dir->kernel_->mutex), dir_(const_cast<Directory*>(dir)) {
1294 } 1292 }
1295 1293
1296 } 1294 } // namespace syncable
1295 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/syncable/directory.h ('k') | sync/syncable/directory_backing_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698