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

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: 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..2d95db36c5204fcebf75d9fe062e7960e3a99abb 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());
}
@@ -113,6 +105,11 @@ void PrefModelAssociator::InitPrefAndAssociate(
return;
}
+void PrefModelAssociator::SetPrefService(PrefService* pref_service) {
+ DCHECK(pref_service_ == NULL);
+ pref_service = pref_service_;
+}
+
SyncError PrefModelAssociator::MergeDataAndStartSyncing(
syncable::ModelType type,
const SyncDataList& initial_sync_data,

Powered by Google App Engine
This is Rietveld 408576698