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

Side by Side Diff: chrome/browser/prefs/pref_service_syncable_factory.cc

Issue 877323002: Mechanical rename of tracing includes for /chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/prefs/pref_service_syncable_factory.h" 5 #include "chrome/browser/prefs/pref_service_syncable_factory.h"
6 6
7 #include "base/debug/trace_event.h"
8 #include "base/prefs/default_pref_store.h" 7 #include "base/prefs/default_pref_store.h"
9 #include "base/prefs/pref_notifier_impl.h" 8 #include "base/prefs/pref_notifier_impl.h"
10 #include "base/prefs/pref_value_store.h" 9 #include "base/prefs/pref_value_store.h"
10 #include "base/trace_event/trace_event.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/prefs/command_line_pref_store.h" 12 #include "chrome/browser/prefs/command_line_pref_store.h"
13 #include "chrome/browser/prefs/pref_service_syncable.h" 13 #include "chrome/browser/prefs/pref_service_syncable.h"
14 #include "components/pref_registry/pref_registry_syncable.h" 14 #include "components/pref_registry/pref_registry_syncable.h"
15 15
16 #if defined(ENABLE_CONFIGURATION_POLICY) 16 #if defined(ENABLE_CONFIGURATION_POLICY)
17 #include "components/policy/core/browser/browser_policy_connector.h" 17 #include "components/policy/core/browser/browser_policy_connector.h"
18 #include "components/policy/core/browser/configuration_policy_pref_store.h" 18 #include "components/policy/core/browser/configuration_policy_pref_store.h"
19 #include "components/policy/core/common/policy_service.h" 19 #include "components/policy/core/common/policy_service.h"
20 #include "components/policy/core/common/policy_types.h" 20 #include "components/policy/core/common/policy_types.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 user_prefs_.get(), 65 user_prefs_.get(),
66 recommended_prefs_.get(), 66 recommended_prefs_.get(),
67 pref_registry->defaults().get(), 67 pref_registry->defaults().get(),
68 pref_notifier), 68 pref_notifier),
69 user_prefs_.get(), 69 user_prefs_.get(),
70 pref_registry, 70 pref_registry,
71 read_error_callback_, 71 read_error_callback_,
72 async_)); 72 async_));
73 return pref_service.Pass(); 73 return pref_service.Pass();
74 } 74 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/chrome_pref_service_factory.cc ('k') | chrome/browser/prerender/prerender_manager_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698