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/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
12 #include "base/prefs/default_pref_store.h" | 12 #include "base/prefs/default_pref_store.h" |
13 #include "base/prefs/json_pref_store.h" | 13 #include "base/prefs/json_pref_store.h" |
14 #include "base/prefs/pref_notifier_impl.h" | 14 #include "base/prefs/pref_notifier_impl.h" |
15 #include "base/prefs/pref_registry.h" | 15 #include "base/prefs/pref_registry.h" |
16 #include "base/prefs/pref_service.h" | 16 #include "base/prefs/pref_service.h" |
17 #include "base/prefs/pref_value_store.h" | 17 #include "base/prefs/pref_value_store.h" |
18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
19 #include "chrome/browser/prefs/command_line_pref_store.h" | 19 #include "chrome/browser/prefs/command_line_pref_store.h" |
| 20 #include "chrome/browser/prefs/pref_hash_filter.h" |
| 21 #include "chrome/browser/prefs/pref_hash_store.h" |
20 #include "chrome/browser/prefs/pref_model_associator.h" | 22 #include "chrome/browser/prefs/pref_model_associator.h" |
21 #include "chrome/browser/prefs/pref_service_syncable.h" | 23 #include "chrome/browser/prefs/pref_service_syncable.h" |
22 #include "chrome/browser/prefs/pref_service_syncable_factory.h" | 24 #include "chrome/browser/prefs/pref_service_syncable_factory.h" |
23 #include "chrome/browser/ui/profile_error_dialog.h" | 25 #include "chrome/browser/ui/profile_error_dialog.h" |
24 #include "components/user_prefs/pref_registry_syncable.h" | 26 #include "components/user_prefs/pref_registry_syncable.h" |
25 #include "content/public/browser/browser_context.h" | 27 #include "content/public/browser/browser_context.h" |
26 #include "content/public/browser/browser_thread.h" | 28 #include "content/public/browser/browser_thread.h" |
27 #include "grit/chromium_strings.h" | 29 #include "grit/chromium_strings.h" |
28 #include "grit/generated_resources.h" | 30 #include "grit/generated_resources.h" |
29 | 31 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 #endif | 75 #endif |
74 } | 76 } |
75 } | 77 } |
76 | 78 |
77 void PrepareBuilder( | 79 void PrepareBuilder( |
78 PrefServiceSyncableFactory* factory, | 80 PrefServiceSyncableFactory* factory, |
79 const base::FilePath& pref_filename, | 81 const base::FilePath& pref_filename, |
80 base::SequencedTaskRunner* pref_io_task_runner, | 82 base::SequencedTaskRunner* pref_io_task_runner, |
81 policy::PolicyService* policy_service, | 83 policy::PolicyService* policy_service, |
82 ManagedUserSettingsService* managed_user_settings, | 84 ManagedUserSettingsService* managed_user_settings, |
| 85 scoped_ptr<PrefHashStore> pref_hash_store, |
83 const scoped_refptr<PrefStore>& extension_prefs, | 86 const scoped_refptr<PrefStore>& extension_prefs, |
84 bool async) { | 87 bool async) { |
85 #if defined(OS_LINUX) | 88 #if defined(OS_LINUX) |
86 // We'd like to see what fraction of our users have the preferences | 89 // We'd like to see what fraction of our users have the preferences |
87 // stored on a network file system, as we've had no end of troubles | 90 // stored on a network file system, as we've had no end of troubles |
88 // with NFS/AFS. | 91 // with NFS/AFS. |
89 // TODO(evanm): remove this once we've collected state. | 92 // TODO(evanm): remove this once we've collected state. |
90 file_util::FileSystemType fstype; | 93 file_util::FileSystemType fstype; |
91 if (file_util::GetFileSystemType(pref_filename.DirName(), &fstype)) { | 94 if (file_util::GetFileSystemType(pref_filename.DirName(), &fstype)) { |
92 UMA_HISTOGRAM_ENUMERATION("PrefService.FileSystemType", | 95 UMA_HISTOGRAM_ENUMERATION("PrefService.FileSystemType", |
(...skipping 22 matching lines...) Expand all Loading... |
115 make_scoped_refptr(new SupervisedUserPrefStore(managed_user_settings))); | 118 make_scoped_refptr(new SupervisedUserPrefStore(managed_user_settings))); |
116 } | 119 } |
117 #endif | 120 #endif |
118 | 121 |
119 factory->set_async(async); | 122 factory->set_async(async); |
120 factory->set_extension_prefs(extension_prefs); | 123 factory->set_extension_prefs(extension_prefs); |
121 factory->set_command_line_prefs( | 124 factory->set_command_line_prefs( |
122 make_scoped_refptr( | 125 make_scoped_refptr( |
123 new CommandLinePrefStore(CommandLine::ForCurrentProcess()))); | 126 new CommandLinePrefStore(CommandLine::ForCurrentProcess()))); |
124 factory->set_read_error_callback(base::Bind(&HandleReadError)); | 127 factory->set_read_error_callback(base::Bind(&HandleReadError)); |
| 128 scoped_ptr<PrefFilter> pref_filter; |
| 129 if (pref_hash_store) |
| 130 pref_filter.reset(new PrefHashFilter(pref_hash_store.Pass())); |
125 factory->set_user_prefs( | 131 factory->set_user_prefs( |
126 new JsonPrefStore(pref_filename, pref_io_task_runner)); | 132 new JsonPrefStore( |
| 133 pref_filename, |
| 134 pref_io_task_runner, |
| 135 pref_filter.Pass())); |
127 } | 136 } |
128 | 137 |
129 } // namespace | 138 } // namespace |
130 | 139 |
131 namespace chrome_prefs { | 140 namespace chrome_prefs { |
132 | 141 |
133 scoped_ptr<PrefService> CreateLocalState( | 142 scoped_ptr<PrefService> CreateLocalState( |
134 const base::FilePath& pref_filename, | 143 const base::FilePath& pref_filename, |
135 base::SequencedTaskRunner* pref_io_task_runner, | 144 base::SequencedTaskRunner* pref_io_task_runner, |
136 policy::PolicyService* policy_service, | 145 policy::PolicyService* policy_service, |
137 const scoped_refptr<PrefRegistry>& pref_registry, | 146 const scoped_refptr<PrefRegistry>& pref_registry, |
138 bool async) { | 147 bool async) { |
139 PrefServiceSyncableFactory factory; | 148 PrefServiceSyncableFactory factory; |
140 PrepareBuilder(&factory, | 149 PrepareBuilder(&factory, |
141 pref_filename, | 150 pref_filename, |
142 pref_io_task_runner, | 151 pref_io_task_runner, |
143 policy_service, | 152 policy_service, |
144 NULL, | 153 NULL, |
| 154 scoped_ptr<PrefHashStore>(), |
145 NULL, | 155 NULL, |
146 async); | 156 async); |
147 return factory.Create(pref_registry.get()); | 157 return factory.Create(pref_registry.get()); |
148 } | 158 } |
149 | 159 |
150 scoped_ptr<PrefServiceSyncable> CreateProfilePrefs( | 160 scoped_ptr<PrefServiceSyncable> CreateProfilePrefs( |
151 const base::FilePath& pref_filename, | 161 const base::FilePath& pref_filename, |
152 base::SequencedTaskRunner* pref_io_task_runner, | 162 base::SequencedTaskRunner* pref_io_task_runner, |
153 policy::PolicyService* policy_service, | 163 policy::PolicyService* policy_service, |
154 ManagedUserSettingsService* managed_user_settings, | 164 ManagedUserSettingsService* managed_user_settings, |
| 165 scoped_ptr<PrefHashStore> pref_hash_store, |
155 const scoped_refptr<PrefStore>& extension_prefs, | 166 const scoped_refptr<PrefStore>& extension_prefs, |
156 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry, | 167 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry, |
157 bool async) { | 168 bool async) { |
158 TRACE_EVENT0("browser", "chrome_prefs::CreateProfilePrefs"); | 169 TRACE_EVENT0("browser", "chrome_prefs::CreateProfilePrefs"); |
159 PrefServiceSyncableFactory factory; | 170 PrefServiceSyncableFactory factory; |
160 PrepareBuilder(&factory, | 171 PrepareBuilder(&factory, |
161 pref_filename, | 172 pref_filename, |
162 pref_io_task_runner, | 173 pref_io_task_runner, |
163 policy_service, | 174 policy_service, |
164 managed_user_settings, | 175 managed_user_settings, |
| 176 pref_hash_store.Pass(), |
165 extension_prefs, | 177 extension_prefs, |
166 async); | 178 async); |
167 return factory.CreateSyncable(pref_registry.get()); | 179 return factory.CreateSyncable(pref_registry.get()); |
168 } | 180 } |
169 | 181 |
170 } // namespace chrome_prefs | 182 } // namespace chrome_prefs |
OLD | NEW |