| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef COMPONENTS_SYNC_PREFERENCES_PREF_MODEL_ASSOCIATOR_H_ | 5 #ifndef COMPONENTS_SYNC_PREFERENCES_PREF_MODEL_ASSOCIATOR_H_ | 
| 6 #define COMPONENTS_SYNC_PREFERENCES_PREF_MODEL_ASSOCIATOR_H_ | 6 #define COMPONENTS_SYNC_PREFERENCES_PREF_MODEL_ASSOCIATOR_H_ | 
| 7 | 7 | 
| 8 #include <map> | 8 #include <map> | 
| 9 #include <memory> | 9 #include <memory> | 
| 10 #include <set> | 10 #include <set> | 
| (...skipping 14 matching lines...) Expand all  Loading... | 
| 25 class Value; | 25 class Value; | 
| 26 } | 26 } | 
| 27 | 27 | 
| 28 namespace sync_pb { | 28 namespace sync_pb { | 
| 29 class PreferenceSpecifics; | 29 class PreferenceSpecifics; | 
| 30 } | 30 } | 
| 31 | 31 | 
| 32 namespace sync_preferences { | 32 namespace sync_preferences { | 
| 33 | 33 | 
| 34 class PrefModelAssociatorClient; | 34 class PrefModelAssociatorClient; | 
| 35 class PrefRegistrySyncable; |  | 
| 36 class PrefServiceSyncable; | 35 class PrefServiceSyncable; | 
| 37 | 36 | 
| 38 // Contains all preference sync related logic. | 37 // Contains all preference sync related logic. | 
| 39 // TODO(sync): Merge this into PrefService once we separate the profile | 38 // TODO(sync): Merge this into PrefService once we separate the profile | 
| 40 // PrefService from the local state PrefService. | 39 // PrefService from the local state PrefService. | 
| 41 class PrefModelAssociator : public syncer::SyncableService, | 40 class PrefModelAssociator : public syncer::SyncableService, | 
| 42                             public base::NonThreadSafe { | 41                             public base::NonThreadSafe { | 
| 43  public: | 42  public: | 
| 44   // Constructs a PrefModelAssociator initializing the |client_| and |type_| | 43   // Constructs a PrefModelAssociator initializing the |client_| and |type_| | 
| 45   // instance variable. The |client| is not owned by this object and the caller | 44   // instance variable. The |client| is not owned by this object and the caller | 
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 199   const PrefModelAssociatorClient* client_;  // Weak. | 198   const PrefModelAssociatorClient* client_;  // Weak. | 
| 200 | 199 | 
| 201   std::vector<base::Closure> callback_list_; | 200   std::vector<base::Closure> callback_list_; | 
| 202 | 201 | 
| 203   DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator); | 202   DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator); | 
| 204 }; | 203 }; | 
| 205 | 204 | 
| 206 }  // namespace sync_preferences | 205 }  // namespace sync_preferences | 
| 207 | 206 | 
| 208 #endif  // COMPONENTS_SYNC_PREFERENCES_PREF_MODEL_ASSOCIATOR_H_ | 207 #endif  // COMPONENTS_SYNC_PREFERENCES_PREF_MODEL_ASSOCIATOR_H_ | 
| OLD | NEW | 
|---|