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

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

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.h
diff --git a/chrome/browser/prefs/pref_model_associator.h b/chrome/browser/prefs/pref_model_associator.h
index 5e2189cfc375486907207b86f9cb3d8ccb15b722..8cb22d69858b1502a5a3500ea7f99a335bed378e 100644
--- a/chrome/browser/prefs/pref_model_associator.h
+++ b/chrome/browser/prefs/pref_model_associator.h
@@ -32,7 +32,7 @@ class PrefModelAssociator
: public SyncableService,
public base::NonThreadSafe {
public:
- explicit PrefModelAssociator(PrefService* pref_service);
+ PrefModelAssociator();
virtual ~PrefModelAssociator();
// SyncableService implementation.
@@ -85,13 +85,11 @@ class PrefModelAssociator
std::string* name);
protected:
+ friend class PrefService;
friend class ProfileSyncServicePreferenceTest;
typedef std::map<std::string, SyncData> SyncDataMap;
- // For testing.
- PrefModelAssociator();
-
// Create an association for a given preference. If |sync_pref| is valid,
// signifying that sync has data for this preference, we reconcile their data
// with ours and append a new UPDATE SyncChange to |sync_changes|. If
@@ -104,6 +102,8 @@ class PrefModelAssociator
const std::string& pref_name,
SyncChangeList* sync_changes);
+ void SetPrefService(PrefService* pref_service);
+
static base::Value* MergeListValues(
const base::Value& from_value, const base::Value& to_value);
static base::Value* MergeDictionaryValues(const base::Value& from_value,

Powered by Google App Engine
This is Rietveld 408576698