| Index: chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
|
| diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
|
| index 0c7d02a1053ac8c3fe03a9cf556aa9c945587243..7a5160225cea0f6488e04fb0e5b44160071340b5 100644
|
| --- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
|
| +++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
|
| @@ -118,12 +118,12 @@ const std::vector<WorkspaceCyclerPref>& GetWorkspaceCyclerPrefs() {
|
| #endif // USE_ASH
|
|
|
| // This class manages gesture configuration preferences.
|
| -class GesturePrefsObserver : public ProfileKeyedService {
|
| +class GesturePrefsObserver : public BrowserContextKeyedService {
|
| public:
|
| explicit GesturePrefsObserver(PrefService* prefs);
|
| virtual ~GesturePrefsObserver();
|
|
|
| - // ProfileKeyedService implementation.
|
| + // BrowserContextKeyedService implementation.
|
| virtual void Shutdown() OVERRIDE;
|
|
|
| private:
|
| @@ -369,12 +369,14 @@ GesturePrefsObserverFactoryAura::GetInstance() {
|
| }
|
|
|
| GesturePrefsObserverFactoryAura::GesturePrefsObserverFactoryAura()
|
| - : ProfileKeyedServiceFactory("GesturePrefsObserverAura",
|
| - ProfileDependencyManager::GetInstance()) {}
|
| + : BrowserContextKeyedServiceFactory(
|
| + "GesturePrefsObserverAura",
|
| + BrowserContextDependencyManager::GetInstance()) {}
|
|
|
| GesturePrefsObserverFactoryAura::~GesturePrefsObserverFactoryAura() {}
|
|
|
| -ProfileKeyedService* GesturePrefsObserverFactoryAura::BuildServiceInstanceFor(
|
| +BrowserContextKeyedService*
|
| +GesturePrefsObserverFactoryAura::BuildServiceInstanceFor(
|
| content::BrowserContext* profile) const {
|
| return new GesturePrefsObserver(static_cast<Profile*>(profile)->GetPrefs());
|
| }
|
| @@ -568,7 +570,8 @@ void GesturePrefsObserverFactoryAura::RegisterUserPrefs(
|
| RegisterWorkspaceCyclerPrefs(registry);
|
| }
|
|
|
| -bool GesturePrefsObserverFactoryAura::ServiceIsCreatedWithProfile() const {
|
| +bool
|
| +GesturePrefsObserverFactoryAura::ServiceIsCreatedWithBrowserContext() const {
|
| // Create the observer as soon as the profile is created.
|
| return true;
|
| }
|
|
|