| 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 CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_ | 5 #ifndef CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_ |
| 6 #define CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_ | 6 #define CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/threading/non_thread_safe.h" | 14 #include "base/threading/non_thread_safe.h" |
| 15 #include "chrome/browser/prefs/pref_service.h" | |
| 16 #include "sync/api/sync_data.h" | 15 #include "sync/api/sync_data.h" |
| 17 #include "sync/api/syncable_service.h" | 16 #include "sync/api/syncable_service.h" |
| 18 | 17 |
| 18 class PrefService; |
| 19 |
| 19 namespace sync_pb { | 20 namespace sync_pb { |
| 20 class PreferenceSpecifics; | 21 class PreferenceSpecifics; |
| 21 } | 22 } |
| 22 | 23 |
| 23 namespace base { | 24 namespace base { |
| 24 class Value; | 25 class Value; |
| 25 } | 26 } |
| 26 | 27 |
| 27 // Contains all preference sync related logic. | 28 // Contains all preference sync related logic. |
| 28 // TODO(sync): Merge this into PrefService once we separate the profile | 29 // TODO(sync): Merge this into PrefService once we separate the profile |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 // Sync's syncer::SyncChange handler. We push all our changes through this. | 149 // Sync's syncer::SyncChange handler. We push all our changes through this. |
| 149 scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; | 150 scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; |
| 150 | 151 |
| 151 // Sync's error handler. We use this to create sync errors. | 152 // Sync's error handler. We use this to create sync errors. |
| 152 scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_; | 153 scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_; |
| 153 | 154 |
| 154 DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator); | 155 DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator); |
| 155 }; | 156 }; |
| 156 | 157 |
| 157 #endif // CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_ | 158 #endif // CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_ |
| OLD | NEW |