OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" | 5 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
12 #include "base/prefs/pref_change_registrar.h" | 12 #include "base/prefs/pref_change_registrar.h" |
13 #include "base/prefs/pref_service.h" | 13 #include "base/prefs/pref_service.h" |
| 14 #include "chrome/browser/profiles/incognito_helpers.h" |
14 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/profiles/profile_dependency_manager.h" | 16 #include "chrome/browser/profiles/profile_dependency_manager.h" |
16 #include "chrome/common/chrome_notification_types.h" | 17 #include "chrome/common/chrome_notification_types.h" |
17 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.h" |
18 #include "components/user_prefs/pref_registry_syncable.h" | 19 #include "components/user_prefs/pref_registry_syncable.h" |
19 #include "content/public/browser/notification_observer.h" | 20 #include "content/public/browser/notification_observer.h" |
20 #include "content/public/browser/notification_service.h" | 21 #include "content/public/browser/notification_service.h" |
21 #include "content/public/browser/overscroll_configuration.h" | 22 #include "content/public/browser/overscroll_configuration.h" |
22 #include "content/public/common/renderer_preferences.h" | 23 #include "content/public/common/renderer_preferences.h" |
23 #include "ui/base/gestures/gesture_configuration.h" | 24 #include "ui/base/gestures/gesture_configuration.h" |
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
527 RegisterOverscrollPrefs(registry); | 528 RegisterOverscrollPrefs(registry); |
528 RegisterFlingCurveParameters(registry); | 529 RegisterFlingCurveParameters(registry); |
529 RegisterWorkspaceCyclerPrefs(registry); | 530 RegisterWorkspaceCyclerPrefs(registry); |
530 } | 531 } |
531 | 532 |
532 bool GesturePrefsObserverFactoryAura::ServiceIsCreatedWithProfile() const { | 533 bool GesturePrefsObserverFactoryAura::ServiceIsCreatedWithProfile() const { |
533 // Create the observer as soon as the profile is created. | 534 // Create the observer as soon as the profile is created. |
534 return true; | 535 return true; |
535 } | 536 } |
536 | 537 |
537 bool GesturePrefsObserverFactoryAura::ServiceRedirectedInIncognito() const { | 538 content::BrowserContext* |
| 539 GesturePrefsObserverFactoryAura::GetBrowserContextToUse( |
| 540 content::BrowserContext* context) const { |
538 // Use same gesture preferences on incognito windows. | 541 // Use same gesture preferences on incognito windows. |
539 return true; | 542 return chrome::GetBrowserContextRedirectedInIncognito(context); |
540 } | 543 } |
541 | 544 |
542 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() const { | 545 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() const { |
543 // Some tests replace the PrefService of the TestingProfile after the | 546 // Some tests replace the PrefService of the TestingProfile after the |
544 // GesturePrefsObserver has been created, which makes Shutdown() | 547 // GesturePrefsObserver has been created, which makes Shutdown() |
545 // remove the registrar from a non-existent PrefService. | 548 // remove the registrar from a non-existent PrefService. |
546 return true; | 549 return true; |
547 } | 550 } |
OLD | NEW |