| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_service.h" | 12 #include "base/prefs/pref_service.h" |
| 13 #include "base/prefs/public/pref_change_registrar.h" | 13 #include "base/prefs/public/pref_change_registrar.h" |
| 14 #include "chrome/browser/prefs/pref_registry_syncable.h" | |
| 15 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/browser/profiles/profile_dependency_manager.h" | 15 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| 17 #include "chrome/common/chrome_notification_types.h" | 16 #include "chrome/common/chrome_notification_types.h" |
| 18 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "components/user_prefs/pref_registry_syncable.h" |
| 19 #include "content/public/browser/notification_observer.h" | 19 #include "content/public/browser/notification_observer.h" |
| 20 #include "content/public/browser/notification_service.h" | 20 #include "content/public/browser/notification_service.h" |
| 21 #include "content/public/browser/overscroll_configuration.h" | 21 #include "content/public/browser/overscroll_configuration.h" |
| 22 #include "content/public/common/renderer_preferences.h" | 22 #include "content/public/common/renderer_preferences.h" |
| 23 #include "ui/base/gestures/gesture_configuration.h" | 23 #include "ui/base/gestures/gesture_configuration.h" |
| 24 | 24 |
| 25 #if defined(USE_ASH) | 25 #if defined(USE_ASH) |
| 26 #include "ash/wm/workspace/workspace_cycler_configuration.h" | 26 #include "ash/wm/workspace/workspace_cycler_configuration.h" |
| 27 #endif // USE_ASH | 27 #endif // USE_ASH |
| 28 | 28 |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 // Use same gesture preferences on incognito windows. | 528 // Use same gesture preferences on incognito windows. |
| 529 return true; | 529 return true; |
| 530 } | 530 } |
| 531 | 531 |
| 532 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() const { | 532 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() const { |
| 533 // Some tests replace the PrefService of the TestingProfile after the | 533 // Some tests replace the PrefService of the TestingProfile after the |
| 534 // GesturePrefsObserver has been created, which makes Shutdown() | 534 // GesturePrefsObserver has been created, which makes Shutdown() |
| 535 // remove the registrar from a non-existent PrefService. | 535 // remove the registrar from a non-existent PrefService. |
| 536 return true; | 536 return true; |
| 537 } | 537 } |
| OLD | NEW |