Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Side by Side Diff: chrome/browser/prefs/pref_model_associator.h

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "sync/api/sync_data.h" 15 #include "sync/api/sync_data.h"
16 #include "sync/api/syncable_service.h" 16 #include "sync/api/syncable_service.h"
17 17
18 class PrefRegistrySyncable;
18 class PrefServiceSyncable; 19 class PrefServiceSyncable;
19 20
20 namespace sync_pb { 21 namespace sync_pb {
21 class PreferenceSpecifics; 22 class PreferenceSpecifics;
22 } 23 }
23 24
24 namespace base { 25 namespace base {
25 class Value; 26 class Value;
26 } 27 }
27 28
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // Sync's syncer::SyncChange handler. We push all our changes through this. 150 // Sync's syncer::SyncChange handler. We push all our changes through this.
150 scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; 151 scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
151 152
152 // Sync's error handler. We use this to create sync errors. 153 // Sync's error handler. We use this to create sync errors.
153 scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_; 154 scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_;
154 155
155 DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator); 156 DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator);
156 }; 157 };
157 158
158 #endif // CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_ 159 #endif // CHROME_BROWSER_PREFS_PREF_MODEL_ASSOCIATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698