| Index: chrome/browser/prefs/pref_model_associator.h
|
| diff --git a/chrome/browser/prefs/pref_model_associator.h b/chrome/browser/prefs/pref_model_associator.h
|
| index 4588b92b036d33c9917ab369375fee9c92956414..b26381694b64fe4b3b244ee2f6a5a156fd34546c 100644
|
| --- a/chrome/browser/prefs/pref_model_associator.h
|
| +++ b/chrome/browser/prefs/pref_model_associator.h
|
| @@ -37,16 +37,16 @@ class PrefModelAssociator
|
|
|
| // syncer::SyncableService implementation.
|
| virtual syncer::SyncDataList GetAllSyncData(
|
| - syncable::ModelType type) const OVERRIDE;
|
| + syncer::ModelType type) const OVERRIDE;
|
| virtual syncer::SyncError ProcessSyncChanges(
|
| const tracked_objects::Location& from_here,
|
| const syncer::SyncChangeList& change_list) OVERRIDE;
|
| virtual syncer::SyncError MergeDataAndStartSyncing(
|
| - syncable::ModelType type,
|
| + syncer::ModelType type,
|
| const syncer::SyncDataList& initial_sync_data,
|
| scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE;
|
| - virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
|
| + virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
|
|
|
| // Returns the list of preference names that are registered as syncable, and
|
| // hence should be monitored for changes.
|
|
|