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

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

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.h
diff --git a/chrome/browser/sync/glue/model_association_manager.h b/chrome/browser/sync/glue/model_association_manager.h
index 07b79335f0cce47aeb81fbd302016bfc96d5f18f..9be4845b7239895a6b7e4881073591143ddd9d7d 100644
--- a/chrome/browser/sync/glue/model_association_manager.h
+++ b/chrome/browser/sync/glue/model_association_manager.h
@@ -97,11 +97,11 @@ class ModelAssociationManager {
// Callback passed to each data type controller on starting association. This
// callback will be invoked when the model association is done.
void TypeStartCallback(DataTypeController::StartResult result,
- const SyncError& error);
+ const csync::SyncError& error);
// Callback that will be invoked when the models finish loading. This callback
// will be passed to |LoadModels| function.
- void ModelLoadCallback(syncable::ModelType type, SyncError error);
+ void ModelLoadCallback(syncable::ModelType type, csync::SyncError error);
// Calls the |LoadModels| method on the next controller waiting to start.
void LoadModelForNextType();
@@ -114,14 +114,14 @@ class ModelAssociationManager {
// do the book keeping and do the UMA reporting.
void AppendToFailedDatatypesAndLogError(
DataTypeController::StartResult result,
- const SyncError& error);
+ const csync::SyncError& error);
syncable::ModelTypeSet GetTypesWaitingToLoad();
State state_;
syncable::ModelTypeSet desired_types_;
- std::list<SyncError> failed_datatypes_info_;
+ std::list<csync::SyncError> failed_datatypes_info_;
std::map<syncable::ModelType, int> start_order_;
// This illustration explains the movement of one DTC through various lists.
« no previous file with comments | « chrome/browser/sync/glue/generic_change_processor.cc ('k') | chrome/browser/sync/glue/model_association_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698