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

Unified Diff: chrome/browser/prefs/pref_value_store.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prefs/pref_value_store.h ('k') | chrome/browser/prefs/pref_value_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_value_store.cc
diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc
index 7797077ee38a8b791c9c6dc28085131e3ca83cbb..82ee811867b130aa65519029d6ad7b707efaba02 100644
--- a/chrome/browser/prefs/pref_value_store.cc
+++ b/chrome/browser/prefs/pref_value_store.cc
@@ -52,9 +52,8 @@ PrefValueStore::PrefValueStore(PrefStore* managed_prefs,
PrefStore* user_prefs,
PrefStore* recommended_prefs,
PrefStore* default_prefs,
- PrefModelAssociator* pref_sync_associator,
PrefNotifier* pref_notifier)
- : pref_sync_associator_(pref_sync_associator),
+ : pref_sync_associator_(NULL),
pref_notifier_(pref_notifier),
initialization_failed_(false) {
InitPrefStore(MANAGED_STORE, managed_prefs);
@@ -76,7 +75,6 @@ PrefValueStore* PrefValueStore::CloneAndSpecialize(
PrefStore* user_prefs,
PrefStore* recommended_prefs,
PrefStore* default_prefs,
- PrefModelAssociator* pref_sync_associator,
PrefNotifier* pref_notifier) {
DCHECK(pref_notifier);
if (!managed_prefs)
@@ -94,7 +92,11 @@ PrefValueStore* PrefValueStore::CloneAndSpecialize(
return new PrefValueStore(
managed_prefs, extension_prefs, command_line_prefs, user_prefs,
- recommended_prefs, default_prefs, pref_sync_associator, pref_notifier);
+ recommended_prefs, default_prefs, pref_notifier);
+}
+
+void PrefValueStore::set_sync_associator(PrefModelAssociator* sync_associator) {
+ pref_sync_associator_ = sync_associator;
}
bool PrefValueStore::GetValue(const std::string& name,
« no previous file with comments | « chrome/browser/prefs/pref_value_store.h ('k') | chrome/browser/prefs/pref_value_store_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698