| Index: chrome/browser/sync/glue/sync_backend_registrar.h
|
| diff --git a/chrome/browser/sync/glue/sync_backend_registrar.h b/chrome/browser/sync/glue/sync_backend_registrar.h
|
| index 6b966d9b57716922ba1ecfb892f2a67a29e203d8..3ffef33036e7f1e18865fb606f2161585eb613a1 100644
|
| --- a/chrome/browser/sync/glue/sync_backend_registrar.h
|
| +++ b/chrome/browser/sync/glue/sync_backend_registrar.h
|
| @@ -38,7 +38,7 @@ class SyncBackendRegistrar : public syncer::SyncManager::ChangeDelegate {
|
| // (initially put in the passive group). |name| is used for
|
| // debugging. Does not take ownership of |profile| or |sync_loop|.
|
| // Must be created on the UI thread.
|
| - SyncBackendRegistrar(syncable::ModelTypeSet initial_types,
|
| + SyncBackendRegistrar(syncer::ModelTypeSet initial_types,
|
| const std::string& name,
|
| Profile* profile,
|
| MessageLoop* sync_loop);
|
| @@ -65,9 +65,9 @@ class SyncBackendRegistrar : public syncer::SyncManager::ChangeDelegate {
|
| // not already there (initially put in the passive group).
|
| // |types_to_remove| and |types_to_add| must be disjoint. Returns
|
| // the set of newly-added types. Must be called on the UI thread.
|
| - syncable::ModelTypeSet ConfigureDataTypes(
|
| - syncable::ModelTypeSet types_to_add,
|
| - syncable::ModelTypeSet types_to_remove);
|
| + syncer::ModelTypeSet ConfigureDataTypes(
|
| + syncer::ModelTypeSet types_to_add,
|
| + syncer::ModelTypeSet types_to_remove);
|
|
|
| // Must be called from the UI thread. (See destructor comment.)
|
| void StopOnUIThread();
|
| @@ -78,7 +78,7 @@ class SyncBackendRegistrar : public syncer::SyncManager::ChangeDelegate {
|
| // Activates the given data type (which should belong to the given
|
| // group) and starts the given change processor. Must be called
|
| // from |group|'s native thread.
|
| - void ActivateDataType(syncable::ModelType type,
|
| + void ActivateDataType(syncer::ModelType type,
|
| syncer::ModelSafeGroup group,
|
| ChangeProcessor* change_processor,
|
| syncer::UserShare* user_share);
|
| @@ -86,19 +86,19 @@ class SyncBackendRegistrar : public syncer::SyncManager::ChangeDelegate {
|
| // Deactivates the given type if necessary. Must be called from the
|
| // UI thread and not |type|'s native thread. Yes, this is
|
| // surprising: see http://crbug.com/92804.
|
| - void DeactivateDataType(syncable::ModelType type);
|
| + void DeactivateDataType(syncer::ModelType type);
|
|
|
| // Returns true only between calls to ActivateDataType(type, ...)
|
| // and DeactivateDataType(type). Used only by tests.
|
| - bool IsTypeActivatedForTest(syncable::ModelType type) const;
|
| + bool IsTypeActivatedForTest(syncer::ModelType type) const;
|
|
|
| // SyncManager::ChangeDelegate implementation. May be called from
|
| // any thread.
|
| virtual void OnChangesApplied(
|
| - syncable::ModelType model_type,
|
| + syncer::ModelType model_type,
|
| const syncer::BaseTransaction* trans,
|
| const syncer::ImmutableChangeRecordList& changes) OVERRIDE;
|
| - virtual void OnChangesComplete(syncable::ModelType model_type) OVERRIDE;
|
| + virtual void OnChangesComplete(syncer::ModelType model_type) OVERRIDE;
|
|
|
| void GetWorkers(std::vector<syncer::ModelSafeWorker*>* out);
|
| void GetModelSafeRoutingInfo(syncer::ModelSafeRoutingInfo* out);
|
| @@ -109,17 +109,17 @@ class SyncBackendRegistrar : public syncer::SyncManager::ChangeDelegate {
|
|
|
| // Returns the change processor for the given model, or NULL if none
|
| // exists. Must be called from |group|'s native thread.
|
| - ChangeProcessor* GetProcessor(syncable::ModelType type) const;
|
| + ChangeProcessor* GetProcessor(syncer::ModelType type) const;
|
|
|
| // Must be called with |lock_| held. Simply returns the change
|
| // processor for the given type, if it exists. May be called from
|
| // any thread.
|
| - ChangeProcessor* GetProcessorUnsafe(syncable::ModelType type) const;
|
| + ChangeProcessor* GetProcessorUnsafe(syncer::ModelType type) const;
|
|
|
| // Return true if |model_type| lives on the current thread. Must be
|
| // called with |lock_| held. May be called on any thread.
|
| bool IsCurrentThreadSafeForModel(
|
| - syncable::ModelType model_type) const;
|
| + syncer::ModelType model_type) const;
|
|
|
| // Name used for debugging.
|
| const std::string name_;
|
| @@ -146,10 +146,10 @@ class SyncBackendRegistrar : public syncer::SyncManager::ChangeDelegate {
|
| // If a key is present, it means at least one ModelType that routes
|
| // to that model safe group is being synced.
|
| WorkerMap workers_;
|
| - syncer::ModelSafeRoutingInfo routing_info_;
|
| + syncer::ModelSafeRoutingInfo routing_info_;
|
|
|
| // The change processors that handle the different data types.
|
| - std::map<syncable::ModelType, ChangeProcessor*> processors_;
|
| + std::map<syncer::ModelType, ChangeProcessor*> processors_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SyncBackendRegistrar);
|
| };
|
|
|