| 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 eb815e3e1fee3863d9d878e3ec76f687acf975cb..2bfe0cdc5f5d016cf9dd6af138d97364e645c9af 100644
|
| --- a/chrome/browser/prefs/pref_model_associator.h
|
| +++ b/chrome/browser/prefs/pref_model_associator.h
|
| @@ -33,7 +33,7 @@ class PrefModelAssociator
|
| : public syncer::SyncableService,
|
| public base::NonThreadSafe {
|
| public:
|
| - PrefModelAssociator();
|
| + explicit PrefModelAssociator(syncer::ModelType type);
|
| virtual ~PrefModelAssociator();
|
|
|
| // See description above field for details.
|
| @@ -84,9 +84,9 @@ class PrefModelAssociator
|
|
|
| // Fills |sync_data| with a sync representation of the preference data
|
| // provided.
|
| - static bool CreatePrefSyncData(const std::string& name,
|
| - const base::Value& value,
|
| - syncer::SyncData* sync_data);
|
| + bool CreatePrefSyncData(const std::string& name,
|
| + const base::Value& value,
|
| + syncer::SyncData* sync_data) const;
|
|
|
| // Extract preference value and name from sync specifics.
|
| base::Value* ReadPreferenceSpecifics(
|
| @@ -149,6 +149,10 @@ class PrefModelAssociator
|
| // Sync's error handler. We use this to create sync errors.
|
| scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_;
|
|
|
| + // The datatype that this associator is responible for, either PREFERENCES or
|
| + // PRIORITY_PREFERENCES.
|
| + syncer::ModelType type_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator);
|
| };
|
|
|
|
|