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

Side by Side Diff: components/syncable_prefs/pref_service_syncable_factory.cc

Issue 1651203002: Update components for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 "components/syncable_prefs/pref_service_syncable_factory.h" 5 #include "components/syncable_prefs/pref_service_syncable_factory.h"
6 6
7 #include "base/prefs/default_pref_store.h"
8 #include "base/prefs/pref_notifier_impl.h"
9 #include "base/prefs/pref_value_store.h"
10 #include "base/trace_event/trace_event.h" 7 #include "base/trace_event/trace_event.h"
11 #include "components/pref_registry/pref_registry_syncable.h" 8 #include "components/pref_registry/pref_registry_syncable.h"
9 #include "components/prefs/default_pref_store.h"
10 #include "components/prefs/pref_notifier_impl.h"
11 #include "components/prefs/pref_value_store.h"
12 #include "components/syncable_prefs/pref_service_syncable.h" 12 #include "components/syncable_prefs/pref_service_syncable.h"
13 13
14 #if defined(ENABLE_CONFIGURATION_POLICY) 14 #if defined(ENABLE_CONFIGURATION_POLICY)
15 #include "components/policy/core/browser/browser_policy_connector.h" 15 #include "components/policy/core/browser/browser_policy_connector.h"
16 #include "components/policy/core/browser/configuration_policy_pref_store.h" 16 #include "components/policy/core/browser/configuration_policy_pref_store.h"
17 #include "components/policy/core/common/policy_service.h" // nogncheck 17 #include "components/policy/core/common/policy_service.h" // nogncheck
18 #include "components/policy/core/common/policy_types.h" // nogncheck 18 #include "components/policy/core/common/policy_types.h" // nogncheck
19 #endif 19 #endif
20 20
21 namespace syncable_prefs { 21 namespace syncable_prefs {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 pref_notifier), 64 pref_notifier),
65 user_prefs_.get(), 65 user_prefs_.get(),
66 pref_registry, 66 pref_registry,
67 pref_model_associator_client_, 67 pref_model_associator_client_,
68 read_error_callback_, 68 read_error_callback_,
69 async_)); 69 async_));
70 return pref_service; 70 return pref_service;
71 } 71 }
72 72
73 } // namespace syncable_prefs 73 } // namespace syncable_prefs
OLDNEW
« no previous file with comments | « components/syncable_prefs/pref_service_syncable_factory.h ('k') | components/syncable_prefs/pref_service_syncable_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698