| 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" |
| 11 #include "base/prefs/default_pref_store.h" | 11 #include "base/prefs/default_pref_store.h" |
| 12 #include "base/prefs/json_pref_store.h" | 12 #include "base/prefs/json_pref_store.h" |
| 13 #include "base/prefs/pref_notifier_impl.h" | 13 #include "base/prefs/pref_notifier_impl.h" |
| 14 #include "base/prefs/pref_registry.h" | 14 #include "base/prefs/pref_registry.h" |
| 15 #include "base/prefs/pref_service.h" | 15 #include "base/prefs/pref_service.h" |
| 16 #include "base/prefs/pref_value_store.h" | 16 #include "base/prefs/pref_value_store.h" |
| 17 #include "chrome/browser/policy/configuration_policy_pref_store.h" | 17 #include "chrome/browser/policy/configuration_policy_pref_store.h" |
| 18 #include "chrome/browser/prefs/command_line_pref_store.h" | 18 #include "chrome/browser/prefs/command_line_pref_store.h" |
| 19 #include "chrome/browser/prefs/pref_model_associator.h" | 19 #include "chrome/browser/prefs/pref_model_associator.h" |
| 20 #include "chrome/browser/prefs/pref_registry_syncable.h" | |
| 21 #include "chrome/browser/prefs/pref_service_syncable_builder.h" | 20 #include "chrome/browser/prefs/pref_service_syncable_builder.h" |
| 22 #include "chrome/browser/profiles/profile.h" | |
| 23 #include "chrome/browser/ui/profile_error_dialog.h" | 21 #include "chrome/browser/ui/profile_error_dialog.h" |
| 22 #include "components/user_prefs/pref_registry_syncable.h" |
| 24 #include "content/public/browser/browser_context.h" | 23 #include "content/public/browser/browser_context.h" |
| 25 #include "content/public/browser/browser_thread.h" | 24 #include "content/public/browser/browser_thread.h" |
| 26 #include "grit/chromium_strings.h" | 25 #include "grit/chromium_strings.h" |
| 27 #include "grit/generated_resources.h" | 26 #include "grit/generated_resources.h" |
| 28 | 27 |
| 29 using content::BrowserContext; | 28 using content::BrowserContext; |
| 30 using content::BrowserThread; | 29 using content::BrowserThread; |
| 31 | 30 |
| 32 namespace { | 31 namespace { |
| 33 | 32 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 builder->WithAsync(async); | 85 builder->WithAsync(async); |
| 87 builder->WithExtensionPrefs(extension_prefs); | 86 builder->WithExtensionPrefs(extension_prefs); |
| 88 builder->WithCommandLinePrefs( | 87 builder->WithCommandLinePrefs( |
| 89 new CommandLinePrefStore(CommandLine::ForCurrentProcess())); | 88 new CommandLinePrefStore(CommandLine::ForCurrentProcess())); |
| 90 builder->WithReadErrorCallback(base::Bind(&HandleReadError)); | 89 builder->WithReadErrorCallback(base::Bind(&HandleReadError)); |
| 91 builder->WithUserPrefs(new JsonPrefStore(pref_filename, pref_io_task_runner)); | 90 builder->WithUserPrefs(new JsonPrefStore(pref_filename, pref_io_task_runner)); |
| 92 } | 91 } |
| 93 | 92 |
| 94 } // namespace | 93 } // namespace |
| 95 | 94 |
| 96 // TODO(joi): Find a better home for this. | |
| 97 PrefService* PrefServiceFromBrowserContext(BrowserContext* context) { | |
| 98 return static_cast<Profile*>(context)->GetPrefs(); | |
| 99 } | |
| 100 | |
| 101 namespace chrome_prefs { | 95 namespace chrome_prefs { |
| 102 | 96 |
| 103 PrefService* CreateLocalState( | 97 PrefService* CreateLocalState( |
| 104 const base::FilePath& pref_filename, | 98 const base::FilePath& pref_filename, |
| 105 base::SequencedTaskRunner* pref_io_task_runner, | 99 base::SequencedTaskRunner* pref_io_task_runner, |
| 106 policy::PolicyService* policy_service, | 100 policy::PolicyService* policy_service, |
| 107 const scoped_refptr<PrefStore>& extension_prefs, | 101 const scoped_refptr<PrefStore>& extension_prefs, |
| 108 const scoped_refptr<PrefRegistry>& pref_registry, | 102 const scoped_refptr<PrefRegistry>& pref_registry, |
| 109 bool async) { | 103 bool async) { |
| 110 PrefServiceSyncableBuilder builder; | 104 PrefServiceSyncableBuilder builder; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 128 PrepareBuilder(&builder, | 122 PrepareBuilder(&builder, |
| 129 pref_filename, | 123 pref_filename, |
| 130 pref_io_task_runner, | 124 pref_io_task_runner, |
| 131 policy_service, | 125 policy_service, |
| 132 extension_prefs, | 126 extension_prefs, |
| 133 async); | 127 async); |
| 134 return builder.CreateSyncable(pref_registry); | 128 return builder.CreateSyncable(pref_registry); |
| 135 } | 129 } |
| 136 | 130 |
| 137 } // namespace chrome_prefs | 131 } // namespace chrome_prefs |
| OLD | NEW |