OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/profile_pref_store_manager.h" | 5 #include "chrome/browser/prefs/profile_pref_store_manager.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/json/json_file_value_serializer.h" | 10 #include "base/json/json_file_value_serializer.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "base/prefs/json_pref_store.h" | 13 #include "base/prefs/json_pref_store.h" |
14 #include "base/prefs/persistent_pref_store.h" | 14 #include "base/prefs/persistent_pref_store.h" |
15 #include "base/prefs/pref_registry_simple.h" | 15 #include "base/prefs/pref_registry_simple.h" |
| 16 #include "base/sequenced_task_runner.h" |
16 #include "chrome/browser/prefs/tracked/pref_hash_store_impl.h" | 17 #include "chrome/browser/prefs/tracked/pref_hash_store_impl.h" |
17 #include "chrome/browser/prefs/tracked/pref_service_hash_store_contents.h" | 18 #include "chrome/browser/prefs/tracked/pref_service_hash_store_contents.h" |
18 #include "chrome/browser/prefs/tracked/segregated_pref_store.h" | 19 #include "chrome/browser/prefs/tracked/segregated_pref_store.h" |
19 #include "chrome/browser/prefs/tracked/tracked_preferences_migration.h" | 20 #include "chrome/browser/prefs/tracked/tracked_preferences_migration.h" |
20 #include "chrome/common/chrome_constants.h" | 21 #include "chrome/common/chrome_constants.h" |
21 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
22 #include "components/pref_registry/pref_registry_syncable.h" | 23 #include "components/pref_registry/pref_registry_syncable.h" |
23 | 24 |
24 // TODO(erikwright): Enable this on Chrome OS and Android once MACs are moved | 25 // TODO(erikwright): Enable this on Chrome OS and Android once MACs are moved |
25 // out of Local State. This will resolve a race condition on Android and a | 26 // out of Local State. This will resolve a race condition on Android and a |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 | 226 |
226 scoped_ptr<PrefHashStore> ProfilePrefStoreManager::GetPrefHashStore( | 227 scoped_ptr<PrefHashStore> ProfilePrefStoreManager::GetPrefHashStore( |
227 bool use_super_mac) { | 228 bool use_super_mac) { |
228 DCHECK(kPlatformSupportsPreferenceTracking); | 229 DCHECK(kPlatformSupportsPreferenceTracking); |
229 | 230 |
230 return scoped_ptr<PrefHashStore>(new PrefHashStoreImpl( | 231 return scoped_ptr<PrefHashStore>(new PrefHashStoreImpl( |
231 seed_, | 232 seed_, |
232 device_id_, | 233 device_id_, |
233 use_super_mac)); | 234 use_super_mac)); |
234 } | 235 } |
OLD | NEW |