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: chrome/browser/sync/glue/model_association_manager.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
Index: chrome/browser/sync/glue/model_association_manager.cc
diff --git a/chrome/browser/sync/glue/model_association_manager.cc b/chrome/browser/sync/glue/model_association_manager.cc
index 2ab340cbc40b716a7db2cf8af97881f8ea37c2c4..e9cd9b3b237ef873fa2448f5a8279438a50d19cd 100644
--- a/chrome/browser/sync/glue/model_association_manager.cc
+++ b/chrome/browser/sync/glue/model_association_manager.cc
@@ -264,7 +264,7 @@ bool ModelAssociationManager::GetControllersNeedingStart(
void ModelAssociationManager::AppendToFailedDatatypesAndLogError(
DataTypeController::StartResult result,
- const csync::SyncError& error) {
+ const syncer::SyncError& error) {
failed_datatypes_info_.push_back(error);
LOG(ERROR) << "Failed to associate models for "
<< syncable::ModelTypeToString(error.type());
@@ -275,7 +275,7 @@ void ModelAssociationManager::AppendToFailedDatatypesAndLogError(
void ModelAssociationManager::TypeStartCallback(
DataTypeController::StartResult result,
- const csync::SyncError& error) {
+ const syncer::SyncError& error) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
TRACE_EVENT_END0("sync", "ModelAssociation");
@@ -332,7 +332,7 @@ void ModelAssociationManager::TypeStartCallback(
break;
}
- std::list<csync::SyncError> errors;
+ std::list<syncer::SyncError> errors;
errors.push_back(error);
// Put our state to idle.
@@ -374,7 +374,7 @@ void ModelAssociationManager::LoadModelForNextType() {
}
void ModelAssociationManager::ModelLoadCallback(
- syncable::ModelType type, csync::SyncError error) {
+ syncable::ModelType type, syncer::SyncError error) {
DVLOG(1) << "ModelAssociationManager: ModelLoadCallback for "
<< syncable::ModelTypeToString(type);
if (state_ == CONFIGURING) {
« no previous file with comments | « chrome/browser/sync/glue/model_association_manager.h ('k') | chrome/browser/sync/glue/model_association_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698