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

Unified Diff: sync/syncable/directory.cc

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/syncable/directory.h ('k') | sync/syncable/directory_backing_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/directory.cc
diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc
index 92ca8fe93bcc6682b04763e15ebf669d9f6d8888..1b515f8d8d543c78cfe7654a69038958b737e332 100644
--- a/sync/syncable/directory.cc
+++ b/sync/syncable/directory.cc
@@ -21,9 +21,9 @@
#include "sync/syncable/syncable_util.h"
#include "sync/syncable/write_transaction.h"
-using csync::Encryptor;
-using csync::ReportUnrecoverableErrorFunction;
-using csync::UnrecoverableErrorHandler;
+using syncer::Encryptor;
+using syncer::ReportUnrecoverableErrorFunction;
+using syncer::UnrecoverableErrorHandler;
using std::string;
namespace syncable {
@@ -113,7 +113,7 @@ const FilePath::CharType Directory::kSyncDatabaseFilename[] =
void Directory::InitKernelForTest(
const std::string& name,
DirectoryChangeDelegate* delegate,
- const csync::WeakHandle<TransactionObserver>&
+ const syncer::WeakHandle<TransactionObserver>&
transaction_observer) {
DCHECK(!kernel_);
kernel_ = new Kernel(name, KernelLoadInfo(), delegate, transaction_observer);
@@ -145,7 +145,7 @@ Directory::SaveChangesSnapshot::~SaveChangesSnapshot() {}
Directory::Kernel::Kernel(
const std::string& name,
const KernelLoadInfo& info, DirectoryChangeDelegate* delegate,
- const csync::WeakHandle<TransactionObserver>&
+ const syncer::WeakHandle<TransactionObserver>&
transaction_observer)
: next_write_transaction_id(0),
name(name),
@@ -198,7 +198,7 @@ Directory::~Directory() {
DirOpenResult Directory::Open(
const string& name,
DirectoryChangeDelegate* delegate,
- const csync::WeakHandle<TransactionObserver>&
+ const syncer::WeakHandle<TransactionObserver>&
transaction_observer) {
TRACE_EVENT0("sync", "SyncDatabaseOpen");
@@ -232,7 +232,7 @@ void Directory::InitializeIndices() {
DirOpenResult Directory::OpenImpl(
const string& name,
DirectoryChangeDelegate* delegate,
- const csync::WeakHandle<TransactionObserver>&
+ const syncer::WeakHandle<TransactionObserver>&
transaction_observer) {
KernelLoadInfo info;
@@ -760,7 +760,7 @@ string Directory::cache_guid() const {
return kernel_->cache_guid;
}
-csync::Cryptographer* Directory::GetCryptographer(
+syncer::Cryptographer* Directory::GetCryptographer(
const BaseTransaction* trans) {
DCHECK_EQ(this, trans->directory());
return &cryptographer_;
« no previous file with comments | « sync/syncable/directory.h ('k') | sync/syncable/directory_backing_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698