summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/chrome_pref_model_associator_client.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/prefs/chrome_pref_model_associator_client.h')
-rw-r--r--chrome/browser/prefs/chrome_pref_model_associator_client.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/prefs/chrome_pref_model_associator_client.h b/chrome/browser/prefs/chrome_pref_model_associator_client.h
index 3895aea..f0b6c94 100644
--- a/chrome/browser/prefs/chrome_pref_model_associator_client.h
+++ b/chrome/browser/prefs/chrome_pref_model_associator_client.h
@@ -15,7 +15,8 @@ template <typename T>
struct DefaultSingletonTraits;
}
-class ChromePrefModelAssociatorClient : public PrefModelAssociatorClient {
+class ChromePrefModelAssociatorClient
+ : public syncable_prefs::PrefModelAssociatorClient {
public:
// Returns the global instance.
static ChromePrefModelAssociatorClient* GetInstance();
@@ -26,7 +27,7 @@ class ChromePrefModelAssociatorClient : public PrefModelAssociatorClient {
ChromePrefModelAssociatorClient();
~ChromePrefModelAssociatorClient() override;
- // PrefModelAssociatorClient implementation.
+ // syncable_prefs::PrefModelAssociatorClient implementation.
bool IsMergeableListPreference(const std::string& pref_name) const override;
bool IsMergeableDictionaryPreference(
const std::string& pref_name) const override;