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

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

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights 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 6e00068c0d8c6acab98eb076fc4752fe50f2e83c..4167926b09be7c6060c40562e0cb11d16e6c7f1b 100644
--- a/chrome/browser/sync/glue/model_association_manager.h
+++ b/chrome/browser/sync/glue/model_association_manager.h
@@ -48,7 +48,7 @@ class ModelAssociationManager {
// should be called before communicating with sync server. A subsequent call
// of Initialize is only allowed if the ModelAssociationManager has invoked
// |OnModelAssociationDone| on the |ModelAssociationResultProcessor|.
- void Initialize(syncable::ModelTypeSet desired_types);
+ void Initialize(syncer::ModelTypeSet desired_types);
// Can be called at any time. Synchronously stops all datatypes.
void Stop();
@@ -101,7 +101,7 @@ class ModelAssociationManager {
// Callback that will be invoked when the models finish loading. This callback
// will be passed to |LoadModels| function.
- void ModelLoadCallback(syncable::ModelType type, syncer::SyncError error);
+ void ModelLoadCallback(syncer::ModelType type, syncer::SyncError error);
// Calls the |LoadModels| method on the next controller waiting to start.
void LoadModelForNextType();
@@ -116,13 +116,13 @@ class ModelAssociationManager {
DataTypeController::StartResult result,
const syncer::SyncError& error);
- syncable::ModelTypeSet GetTypesWaitingToLoad();
+ syncer::ModelTypeSet GetTypesWaitingToLoad();
State state_;
- syncable::ModelTypeSet desired_types_;
+ syncer::ModelTypeSet desired_types_;
std::list<syncer::SyncError> failed_datatypes_info_;
- std::map<syncable::ModelType, int> start_order_;
+ std::map<syncer::ModelType, int> start_order_;
// This illustration explains the movement of one DTC through various lists.
// Consider a dataype, say, BOOKMARKS which is NOT_RUNNING and will be
« 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