| 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 "base/compiler_specific.h" |    7 #include "base/compiler_specific.h" | 
|    8 #include "chrome/browser/prefs/pref_change_registrar.h" |    8 #include "chrome/browser/api/prefs/pref_change_registrar.h" | 
|    9 #include "chrome/browser/prefs/pref_service.h" |    9 #include "chrome/browser/prefs/pref_service.h" | 
|   10 #include "chrome/browser/profiles/profile.h" |   10 #include "chrome/browser/profiles/profile.h" | 
|   11 #include "chrome/browser/profiles/profile_dependency_manager.h" |   11 #include "chrome/browser/profiles/profile_dependency_manager.h" | 
|   12 #include "chrome/common/chrome_notification_types.h" |   12 #include "chrome/common/chrome_notification_types.h" | 
|   13 #include "chrome/common/pref_names.h" |   13 #include "chrome/common/pref_names.h" | 
|   14 #include "content/public/browser/notification_observer.h" |   14 #include "content/public/browser/notification_observer.h" | 
|   15 #include "ui/base/gestures/gesture_configuration.h" |   15 #include "ui/base/gestures/gesture_configuration.h" | 
|   16  |   16  | 
|   17 using ui::GestureConfiguration; |   17 using ui::GestureConfiguration; | 
|   18  |   18  | 
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  247   // Use same gesture preferences on incognito windows. |  247   // Use same gesture preferences on incognito windows. | 
|  248   return true; |  248   return true; | 
|  249 } |  249 } | 
|  250  |  250  | 
|  251 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() { |  251 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() { | 
|  252   // Some tests replace the PrefService of the TestingProfile after the |  252   // Some tests replace the PrefService of the TestingProfile after the | 
|  253   // GesturePrefsObserver has been created, which makes Shutdown() |  253   // GesturePrefsObserver has been created, which makes Shutdown() | 
|  254   // remove the registrar from a non-existent PrefService. |  254   // remove the registrar from a non-existent PrefService. | 
|  255   return true; |  255   return true; | 
|  256 } |  256 } | 
| OLD | NEW |