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

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

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix 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 40e6f345ee70a4ef07f21b2202cf80b2cd7a126a..b4bf6a20ac82bc9a80b4483ddc00c4c1ca0add8d 100644
--- a/chrome/browser/sync/glue/model_association_manager.cc
+++ b/chrome/browser/sync/glue/model_association_manager.cc
@@ -262,7 +262,7 @@ bool ModelAssociationManager::GetControllersNeedingStart(
void ModelAssociationManager::AppendToFailedDatatypesAndLogError(
DataTypeController::StartResult result,
- const SyncError& error) {
+ const csync::SyncError& error) {
failed_datatypes_info_.push_back(error);
LOG(ERROR) << "Failed to associate models for "
<< syncable::ModelTypeToString(error.type());
@@ -273,7 +273,7 @@ void ModelAssociationManager::AppendToFailedDatatypesAndLogError(
void ModelAssociationManager::TypeStartCallback(
DataTypeController::StartResult result,
- const SyncError& error) {
+ const csync::SyncError& error) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
TRACE_EVENT_END0("sync", "ModelAssociation");
@@ -330,7 +330,7 @@ void ModelAssociationManager::TypeStartCallback(
break;
}
- std::list<SyncError> errors;
+ std::list<csync::SyncError> errors;
errors.push_back(error);
// Put our state to idle.
@@ -372,7 +372,7 @@ void ModelAssociationManager::LoadModelForNextType() {
}
void ModelAssociationManager::ModelLoadCallback(
- syncable::ModelType type, SyncError error) {
+ syncable::ModelType type, csync::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