| Index: chrome/browser/ui/gesture_prefs_observer_factory_aura.h
|
| diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.h b/chrome/browser/ui/gesture_prefs_observer_factory_aura.h
|
| index 1e069ded01785563887866cd3e78732ee7aabbdf..46364ecd000a1fcb4272bc2475056a017b482acc 100644
|
| --- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.h
|
| +++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.h
|
| @@ -9,7 +9,8 @@
|
| #include "base/memory/singleton.h"
|
| #include "chrome/browser/profiles/profile_keyed_service_factory.h"
|
|
|
| -class PrefServiceSyncable;
|
| +class PrefRegistrySyncable;
|
| +class PrefService;
|
| class Profile;
|
|
|
| // Create an observer per Profile that listens for gesture preferences updates.
|
| @@ -23,13 +24,15 @@ class GesturePrefsObserverFactoryAura : public ProfileKeyedServiceFactory {
|
| GesturePrefsObserverFactoryAura();
|
| virtual ~GesturePrefsObserverFactoryAura();
|
|
|
| - void RegisterOverscrollPrefs(PrefServiceSyncable* prefs);
|
| - void RegisterFlingCurveParameters(PrefServiceSyncable* prefs);
|
| + void RegisterOverscrollPrefs(PrefRegistrySyncable* prefs);
|
| + void RegisterFlingCurveParameters(PrefRegistrySyncable* prefs);
|
|
|
| // ProfileKeyedServiceFactory:
|
| virtual ProfileKeyedService* BuildServiceInstanceFor(
|
| Profile* profile) const OVERRIDE;
|
| - virtual void RegisterUserPrefs(PrefServiceSyncable* prefs) OVERRIDE;
|
| + virtual void DeprecatedRegisterUserPrefs(
|
| + PrefService* prefs,
|
| + PrefRegistrySyncable* registry) OVERRIDE;
|
| virtual bool ServiceIsCreatedWithProfile() const OVERRIDE;
|
| virtual bool ServiceRedirectedInIncognito() const OVERRIDE;
|
| virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
|
|
|