Chromium Code Reviews| Index: chrome/browser/sync/sync_prefs.h |
| diff --git a/chrome/browser/sync/sync_prefs.h b/chrome/browser/sync/sync_prefs.h |
| index bb67b1c3812c26210a06d427d25519a84bcbf862..021a065ed81e2eef5ce5fbee3b883f9eb96d8464 100644 |
| --- a/chrome/browser/sync/sync_prefs.h |
| +++ b/chrome/browser/sync/sync_prefs.h |
| @@ -118,6 +118,7 @@ class SyncPrefs : public base::SupportsWeakPtr<SyncPrefs>, |
| syncable::ModelTypeSet GetAcknowledgeSyncedTypesForTest() const; |
| private: |
| + void RegisterDependentTypes(); |
|
akalin
2012/03/01 07:40:59
I guess this'll be RegisterPrefGroups
not at google - send to devlin
2012/03/01 23:39:36
Done.
|
| void RegisterPreferences(); |
| void RegisterDataTypePreferredPref( |
| @@ -125,6 +126,12 @@ class SyncPrefs : public base::SupportsWeakPtr<SyncPrefs>, |
| bool GetDataTypePreferred(syncable::ModelType type) const; |
| void SetDataTypePreferred(syncable::ModelType type, bool is_preferred); |
| + // Returns a ModelTypeSet based on |types| augmented with any dependent types |
|
akalin
2012/03/01 07:40:59
augmented with any dependent types ... ->
expanded
not at google - send to devlin
2012/03/01 23:39:36
Done.
|
| + // (see |dependent_types_|), but as a subset of |registered_types|. |
| + syncable::ModelTypeSet ResolveDependentTypes( |
| + const syncable::ModelTypeSet& registered_types, |
| + const syncable::ModelTypeSet& types) const; |
| + |
| base::NonThreadSafe non_thread_safe_; |
| // May be NULL. |
| @@ -136,6 +143,13 @@ class SyncPrefs : public base::SupportsWeakPtr<SyncPrefs>, |
| // configuration management. |
| BooleanPrefMember pref_sync_managed_; |
| + // Data types where the enable/disabled preference is dependent on another |
| + // type, such APP_NOTIFICATIONS on APPS. This is map from dependent type |
| + // (APP_NOTIFICATIONS) -> type depended on (APPS). |
| + typedef std::map<syncable::ModelType, syncable::ModelType> |
| + DependentTypesMap; |
| + DependentTypesMap dependent_types_; |
| + |
| DISALLOW_COPY_AND_ASSIGN(SyncPrefs); |
| }; |