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

Unified Diff: chrome/browser/sync/glue/sync_backend_registrar.cc

Issue 408003002: [Sync] Fix namespace for sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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
Index: chrome/browser/sync/glue/sync_backend_registrar.cc
diff --git a/chrome/browser/sync/glue/sync_backend_registrar.cc b/chrome/browser/sync/glue/sync_backend_registrar.cc
index 4e26ff051bb1ee83c2fba3d3c7102f1dfe5c292e..2926e158e9849622e4596a46e897bb7530fe4431 100644
--- a/chrome/browser/sync/glue/sync_backend_registrar.cc
+++ b/chrome/browser/sync/glue/sync_backend_registrar.cc
@@ -202,7 +202,7 @@ void SyncBackendRegistrar::RequestWorkerStopOnUIThread() {
void SyncBackendRegistrar::ActivateDataType(
syncer::ModelType type,
syncer::ModelSafeGroup group,
- ChangeProcessor* change_processor,
+ sync_driver::ChangeProcessor* change_processor,
syncer::UserShare* user_share) {
DVLOG(1) << "Activate: " << syncer::ModelTypeToString(type);
@@ -244,7 +244,7 @@ void SyncBackendRegistrar::OnChangesApplied(
int64 model_version,
const syncer::BaseTransaction* trans,
const syncer::ImmutableChangeRecordList& changes) {
- ChangeProcessor* processor = GetProcessor(model_type);
+ sync_driver::ChangeProcessor* processor = GetProcessor(model_type);
if (!processor)
return;
@@ -252,7 +252,7 @@ void SyncBackendRegistrar::OnChangesApplied(
}
void SyncBackendRegistrar::OnChangesComplete(syncer::ModelType model_type) {
- ChangeProcessor* processor = GetProcessor(model_type);
+ sync_driver::ChangeProcessor* processor = GetProcessor(model_type);
if (!processor)
return;
@@ -279,10 +279,10 @@ void SyncBackendRegistrar::GetModelSafeRoutingInfo(
out->swap(copy);
}
-ChangeProcessor* SyncBackendRegistrar::GetProcessor(
+sync_driver::ChangeProcessor* SyncBackendRegistrar::GetProcessor(
syncer::ModelType type) const {
base::AutoLock lock(lock_);
- ChangeProcessor* processor = GetProcessorUnsafe(type);
+ sync_driver::ChangeProcessor* processor = GetProcessorUnsafe(type);
if (!processor)
return NULL;
@@ -292,10 +292,10 @@ ChangeProcessor* SyncBackendRegistrar::GetProcessor(
return processor;
}
-ChangeProcessor* SyncBackendRegistrar::GetProcessorUnsafe(
+sync_driver::ChangeProcessor* SyncBackendRegistrar::GetProcessorUnsafe(
syncer::ModelType type) const {
lock_.AssertAcquired();
- std::map<syncer::ModelType, ChangeProcessor*>::const_iterator
+ std::map<syncer::ModelType, sync_driver::ChangeProcessor*>::const_iterator
it = processors_.find(type);
// Until model association happens for a datatype, it will not
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_registrar.h ('k') | chrome/browser/sync/glue/sync_backend_registrar_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698