Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: chrome/browser/ui/gesture_prefs_observer_factory_aura.cc

Issue 662803002: Fix includes in //components/keyed_service/content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix compilation on !Linux Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/profiles/incognito_helpers.h" 15 #include "chrome/browser/profiles/incognito_helpers.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "components/keyed_service/content/browser_context_dependency_manager.h" 18 #include "components/keyed_service/content/browser_context_dependency_manager.h"
19 #include "components/keyed_service/core/keyed_service.h"
19 #include "components/pref_registry/pref_registry_syncable.h" 20 #include "components/pref_registry/pref_registry_syncable.h"
20 #include "content/public/browser/notification_observer.h" 21 #include "content/public/browser/notification_observer.h"
21 #include "content/public/browser/notification_service.h" 22 #include "content/public/browser/notification_service.h"
22 #include "content/public/browser/overscroll_configuration.h" 23 #include "content/public/browser/overscroll_configuration.h"
23 #include "content/public/common/renderer_preferences.h" 24 #include "content/public/common/renderer_preferences.h"
24 #include "ui/events/gestures/gesture_configuration.h" 25 #include "ui/events/gestures/gesture_configuration.h"
25 26
26 using ui::GestureConfiguration; 27 using ui::GestureConfiguration;
27 28
28 namespace { 29 namespace {
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 // Use same gesture preferences on incognito windows. 246 // Use same gesture preferences on incognito windows.
246 return chrome::GetBrowserContextRedirectedInIncognito(context); 247 return chrome::GetBrowserContextRedirectedInIncognito(context);
247 } 248 }
248 249
249 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() const { 250 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() const {
250 // Some tests replace the PrefService of the TestingProfile after the 251 // Some tests replace the PrefService of the TestingProfile after the
251 // GesturePrefsObserver has been created, which makes Shutdown() 252 // GesturePrefsObserver has been created, which makes Shutdown()
252 // remove the registrar from a non-existent PrefService. 253 // remove the registrar from a non-existent PrefService.
253 return true; 254 return true;
254 } 255 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698