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

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

Issue 8568019: Introduce per-tab preferences service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed ProfileSyncServicePreferenceTest tests Created 9 years, 1 month 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
Index: chrome/browser/prefs/pref_model_associator.cc
diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc
index 40f2dff3f32a2bc8e5253c9b6ced5c70682b51df..df85cbe676673b23e5e444288b663a8b59c932bc 100644
--- a/chrome/browser/prefs/pref_model_associator.cc
+++ b/chrome/browser/prefs/pref_model_associator.cc
@@ -23,14 +23,6 @@ PrefModelAssociator::PrefModelAssociator()
processing_syncer_changes_(false),
pref_service_(NULL),
sync_processor_(NULL) {
-}
-
-PrefModelAssociator::PrefModelAssociator(
- PrefService* pref_service)
- : models_associated_(false),
- processing_syncer_changes_(false),
- pref_service_(pref_service),
- sync_processor_(NULL) {
DCHECK(CalledOnValidThread());
}
@@ -119,6 +111,7 @@ SyncError PrefModelAssociator::MergeDataAndStartSyncing(
SyncChangeProcessor* sync_processor) {
DCHECK_EQ(type, PREFERENCES);
DCHECK(CalledOnValidThread());
+ DCHECK(pref_service_);
DCHECK(!sync_processor_);
sync_processor_ = sync_processor;
@@ -430,3 +423,8 @@ void PrefModelAssociator::ProcessPrefChange(const std::string& name) {
if (error.IsSet())
StopSyncing(PREFERENCES);
}
+
+void PrefModelAssociator::SetPrefService(PrefService* pref_service) {
+ DCHECK(pref_service_ == NULL);
+ pref_service_ = pref_service;
+}

Powered by Google App Engine
This is Rietveld 408576698