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

Unified Diff: sync/syncable/directory.cc

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fiix indent 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 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.h » ('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 a63538cf91ac61ca05d6f72051a67121753bc1a1..d30c0d5542e77b291e066a89d8a2f3d3ade86805 100644
--- a/sync/syncable/directory.cc
+++ b/sync/syncable/directory.cc
@@ -108,8 +108,7 @@ const FilePath::CharType Directory::kSyncDatabaseFilename[] =
void Directory::InitKernelForTest(
const std::string& name,
DirectoryChangeDelegate* delegate,
- const syncer::WeakHandle<TransactionObserver>&
- transaction_observer) {
+ const WeakHandle<TransactionObserver>& transaction_observer) {
DCHECK(!kernel_);
kernel_ = new Kernel(name, KernelLoadInfo(), delegate, transaction_observer);
}
@@ -140,8 +139,7 @@ Directory::SaveChangesSnapshot::~SaveChangesSnapshot() {}
Directory::Kernel::Kernel(
const std::string& name,
const KernelLoadInfo& info, DirectoryChangeDelegate* delegate,
- const syncer::WeakHandle<TransactionObserver>&
- transaction_observer)
+ const WeakHandle<TransactionObserver>& transaction_observer)
: next_write_transaction_id(0),
name(name),
metahandles_index(new Directory::MetahandlesIndex),
@@ -194,8 +192,7 @@ Directory::~Directory() {
DirOpenResult Directory::Open(
const string& name,
DirectoryChangeDelegate* delegate,
- const syncer::WeakHandle<TransactionObserver>&
- transaction_observer) {
+ const WeakHandle<TransactionObserver>& transaction_observer) {
TRACE_EVENT0("sync", "SyncDatabaseOpen");
const DirOpenResult result =
@@ -228,7 +225,7 @@ void Directory::InitializeIndices() {
DirOpenResult Directory::OpenImpl(
const string& name,
DirectoryChangeDelegate* delegate,
- const syncer::WeakHandle<TransactionObserver>&
+ const WeakHandle<TransactionObserver>&
transaction_observer) {
KernelLoadInfo info;
@@ -623,7 +620,7 @@ bool Directory::PurgeEntriesWithTypeIn(ModelTypeSet types) {
}
// Ensure meta tracking for these data types reflects the deleted state.
- for (syncer::ModelTypeSet::Iterator it = types.First();
+ for (ModelTypeSet::Iterator it = types.First();
it.Good(); it.Inc()) {
set_initial_sync_ended_for_type_unsafe(it.Get(), false);
kernel_->persisted_info.reset_download_progress(it.Get());
@@ -757,8 +754,7 @@ string Directory::cache_guid() const {
return kernel_->cache_guid;
}
-syncer::Cryptographer* Directory::GetCryptographer(
- const BaseTransaction* trans) {
+Cryptographer* Directory::GetCryptographer(const BaseTransaction* trans) {
DCHECK_EQ(this, trans->directory());
return &cryptographer_;
}
@@ -799,7 +795,7 @@ int64 Directory::unsynced_entity_count() const {
FullModelTypeSet Directory::GetServerTypesWithUnappliedUpdates(
BaseTransaction* trans) const {
- syncer::FullModelTypeSet server_types;
+ FullModelTypeSet server_types;
ScopedKernelLock lock(this);
for (int i = UNSPECIFIED; i < MODEL_TYPE_COUNT; ++i) {
const ModelType type = ModelTypeFromInt(i);
« 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