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/pref_service_syncable_builder.h" | 5 #include "chrome/browser/prefs/pref_service_syncable_builder.h" |
6 | 6 |
7 #include "base/prefs/default_pref_store.h" | 7 #include "base/prefs/default_pref_store.h" |
| 8 #include "base/prefs/pref_notifier_impl.h" |
| 9 #include "base/prefs/pref_value_store.h" |
8 #include "chrome/browser/policy/configuration_policy_pref_store.h" | 10 #include "chrome/browser/policy/configuration_policy_pref_store.h" |
9 #include "chrome/browser/policy/policy_service.h" | 11 #include "chrome/browser/policy/policy_service.h" |
10 #include "chrome/browser/prefs/command_line_pref_store.h" | 12 #include "chrome/browser/prefs/command_line_pref_store.h" |
11 #include "chrome/browser/prefs/pref_notifier_impl.h" | |
12 #include "chrome/browser/prefs/pref_registry_syncable.h" | 13 #include "chrome/browser/prefs/pref_registry_syncable.h" |
13 #include "chrome/browser/prefs/pref_service_syncable.h" | 14 #include "chrome/browser/prefs/pref_service_syncable.h" |
14 #include "chrome/browser/prefs/pref_value_store.h" | |
15 | 15 |
16 PrefServiceSyncableBuilder::PrefServiceSyncableBuilder() { | 16 PrefServiceSyncableBuilder::PrefServiceSyncableBuilder() { |
17 } | 17 } |
18 | 18 |
19 PrefServiceSyncableBuilder::~PrefServiceSyncableBuilder() { | 19 PrefServiceSyncableBuilder::~PrefServiceSyncableBuilder() { |
20 } | 20 } |
21 | 21 |
22 #if defined(ENABLE_CONFIGURATION_POLICY) | 22 #if defined(ENABLE_CONFIGURATION_POLICY) |
23 PrefServiceSyncableBuilder& PrefServiceSyncableBuilder::WithManagedPolicies( | 23 PrefServiceSyncableBuilder& PrefServiceSyncableBuilder::WithManagedPolicies( |
24 policy::PolicyService* service) { | 24 policy::PolicyService* service) { |
(...skipping 29 matching lines...) Expand all Loading... |
54 recommended_prefs_.get(), | 54 recommended_prefs_.get(), |
55 pref_registry->defaults(), | 55 pref_registry->defaults(), |
56 pref_notifier), | 56 pref_notifier), |
57 user_prefs_.get(), | 57 user_prefs_.get(), |
58 pref_registry, | 58 pref_registry, |
59 read_error_callback_, | 59 read_error_callback_, |
60 async_); | 60 async_); |
61 ResetDefaultState(); | 61 ResetDefaultState(); |
62 return pref_service; | 62 return pref_service; |
63 } | 63 } |
OLD | NEW |