Index: chrome/browser/profiles/profile_impl.h |
diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h |
index 1e0096ab0d559ab4cc64213e267181403adcb0d6..b6026892b64f9915482f2d56e06fbcce35cf3fe3 100644 |
--- a/chrome/browser/profiles/profile_impl.h |
+++ b/chrome/browser/profiles/profile_impl.h |
@@ -21,7 +21,7 @@ |
#include "content/public/browser/notification_registrar.h" |
class NetPrefObserver; |
-class PrefService; |
+class PrefServiceSyncable; |
class PrefServiceBase; |
class PromoResourceService; |
class SSLConfigServiceManager; |
@@ -59,7 +59,7 @@ class ProfileImpl : public Profile, |
virtual ~ProfileImpl(); |
- static void RegisterUserPrefs(PrefService* prefs); |
+ static void RegisterUserPrefs(PrefServiceSyncable* prefs); |
// content::BrowserContext implementation: |
virtual FilePath GetPath() OVERRIDE; |
@@ -102,8 +102,8 @@ class ProfileImpl : public Profile, |
virtual policy::ManagedModePolicyProvider* |
GetManagedModePolicyProvider() OVERRIDE; |
virtual policy::PolicyService* GetPolicyService() OVERRIDE; |
- virtual PrefService* GetPrefs() OVERRIDE; |
- virtual PrefService* GetOffTheRecordPrefs() OVERRIDE; |
+ virtual PrefServiceSyncable* GetPrefs() OVERRIDE; |
+ virtual PrefServiceSyncable* GetOffTheRecordPrefs() OVERRIDE; |
Mattias Nissler (ping if slow)
2012/12/20 13:41:52
Can we return PrefServiceBase* for these two?
Jói
2012/12/20 16:30:31
Not right now, this seems to be primarily because
|
virtual net::URLRequestContextGetter* |
GetRequestContextForExtensions() OVERRIDE; |
virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE; |
@@ -221,8 +221,8 @@ class ProfileImpl : public Profile, |
// Keep |prefs_| on top for destruction order because |extension_prefs_|, |
// |net_pref_observer_|, |promo_resource_service_|, |io_data_| an others store |
// pointers to |prefs_| and shall be destructed first. |
- scoped_ptr<PrefService> prefs_; |
- scoped_ptr<PrefService> otr_prefs_; |
+ scoped_ptr<PrefServiceSyncable> prefs_; |
+ scoped_ptr<PrefServiceSyncable> otr_prefs_; |
ProfileImplIOData::Handle io_data_; |
scoped_refptr<ExtensionSpecialStoragePolicy> |
extension_special_storage_policy_; |