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_util.h" | 8 #include "base/file_util.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 using policy::ConfigurationPolicyPrefStore; | 76 using policy::ConfigurationPolicyPrefStore; |
77 builder->WithManagedPrefs( | 77 builder->WithManagedPrefs( |
78 ConfigurationPolicyPrefStore::CreateMandatoryPolicyPrefStore( | 78 ConfigurationPolicyPrefStore::CreateMandatoryPolicyPrefStore( |
79 policy_service)); | 79 policy_service)); |
80 builder->WithRecommendedPrefs( | 80 builder->WithRecommendedPrefs( |
81 ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore( | 81 ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore( |
82 policy_service)); | 82 policy_service)); |
83 #endif // ENABLE_CONFIGURATION_POLICY | 83 #endif // ENABLE_CONFIGURATION_POLICY |
84 | 84 |
85 builder->WithAsync(async); | 85 builder->WithAsync(async); |
86 builder->WithExtensionPrefs(extension_prefs); | 86 builder->WithExtensionPrefs(extension_prefs.get()); |
87 builder->WithCommandLinePrefs( | 87 builder->WithCommandLinePrefs( |
88 new CommandLinePrefStore(CommandLine::ForCurrentProcess())); | 88 new CommandLinePrefStore(CommandLine::ForCurrentProcess())); |
89 builder->WithReadErrorCallback(base::Bind(&HandleReadError)); | 89 builder->WithReadErrorCallback(base::Bind(&HandleReadError)); |
90 builder->WithUserPrefs(new JsonPrefStore(pref_filename, pref_io_task_runner)); | 90 builder->WithUserPrefs(new JsonPrefStore(pref_filename, pref_io_task_runner)); |
91 } | 91 } |
92 | 92 |
93 } // namespace | 93 } // namespace |
94 | 94 |
95 namespace chrome_prefs { | 95 namespace chrome_prefs { |
96 | 96 |
97 PrefService* CreateLocalState( | 97 PrefService* CreateLocalState( |
98 const base::FilePath& pref_filename, | 98 const base::FilePath& pref_filename, |
99 base::SequencedTaskRunner* pref_io_task_runner, | 99 base::SequencedTaskRunner* pref_io_task_runner, |
100 policy::PolicyService* policy_service, | 100 policy::PolicyService* policy_service, |
101 const scoped_refptr<PrefStore>& extension_prefs, | 101 const scoped_refptr<PrefStore>& extension_prefs, |
102 const scoped_refptr<PrefRegistry>& pref_registry, | 102 const scoped_refptr<PrefRegistry>& pref_registry, |
103 bool async) { | 103 bool async) { |
104 PrefServiceSyncableBuilder builder; | 104 PrefServiceSyncableBuilder builder; |
105 PrepareBuilder(&builder, | 105 PrepareBuilder(&builder, |
106 pref_filename, | 106 pref_filename, |
107 pref_io_task_runner, | 107 pref_io_task_runner, |
108 policy_service, | 108 policy_service, |
109 extension_prefs, | 109 extension_prefs, |
110 async); | 110 async); |
111 return builder.Create(pref_registry); | 111 return builder.Create(pref_registry.get()); |
112 } | 112 } |
113 | 113 |
114 PrefServiceSyncable* CreateProfilePrefs( | 114 PrefServiceSyncable* CreateProfilePrefs( |
115 const base::FilePath& pref_filename, | 115 const base::FilePath& pref_filename, |
116 base::SequencedTaskRunner* pref_io_task_runner, | 116 base::SequencedTaskRunner* pref_io_task_runner, |
117 policy::PolicyService* policy_service, | 117 policy::PolicyService* policy_service, |
118 const scoped_refptr<PrefStore>& extension_prefs, | 118 const scoped_refptr<PrefStore>& extension_prefs, |
119 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry, | 119 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry, |
120 bool async) { | 120 bool async) { |
121 PrefServiceSyncableBuilder builder; | 121 PrefServiceSyncableBuilder builder; |
122 PrepareBuilder(&builder, | 122 PrepareBuilder(&builder, |
123 pref_filename, | 123 pref_filename, |
124 pref_io_task_runner, | 124 pref_io_task_runner, |
125 policy_service, | 125 policy_service, |
126 extension_prefs, | 126 extension_prefs, |
127 async); | 127 async); |
128 return builder.CreateSyncable(pref_registry); | 128 return builder.CreateSyncable(pref_registry.get()); |
129 } | 129 } |
130 | 130 |
131 } // namespace chrome_prefs | 131 } // namespace chrome_prefs |
OLD | NEW |