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/prefs/chrome_pref_service_factory.h" | 5 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 extension_prefs, | 114 extension_prefs, |
115 async); | 115 async); |
116 return builder.Create(pref_registry); | 116 return builder.Create(pref_registry); |
117 } | 117 } |
118 | 118 |
119 PrefServiceSyncable* CreateProfilePrefs( | 119 PrefServiceSyncable* CreateProfilePrefs( |
120 const FilePath& pref_filename, | 120 const FilePath& pref_filename, |
121 base::SequencedTaskRunner* pref_io_task_runner, | 121 base::SequencedTaskRunner* pref_io_task_runner, |
122 policy::PolicyService* policy_service, | 122 policy::PolicyService* policy_service, |
123 const scoped_refptr<PrefStore>& extension_prefs, | 123 const scoped_refptr<PrefStore>& extension_prefs, |
| 124 const scoped_refptr<PrefRegistrySyncable>& pref_registry, |
124 bool async) { | 125 bool async) { |
125 PrefServiceSyncableBuilder builder; | 126 PrefServiceSyncableBuilder builder; |
126 PrepareBuilder(&builder, | 127 PrepareBuilder(&builder, |
127 pref_filename, | 128 pref_filename, |
128 pref_io_task_runner, | 129 pref_io_task_runner, |
129 policy_service, | 130 policy_service, |
130 extension_prefs, | 131 extension_prefs, |
131 async); | 132 async); |
132 return builder.CreateSyncable(); | 133 return builder.CreateSyncable(pref_registry); |
133 } | 134 } |
134 | 135 |
135 } // namespace chrome_prefs | 136 } // namespace chrome_prefs |
OLD | NEW |