| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "components/prefs/pref_service_factory.h" | 5 #include "components/prefs/pref_service_factory.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/sequenced_task_runner.h" | 8 #include "base/sequenced_task_runner.h" |
| 9 #include "components/prefs/default_pref_store.h" | 9 #include "components/prefs/default_pref_store.h" |
| 10 #include "components/prefs/json_pref_store.h" | 10 #include "components/prefs/json_pref_store.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 std::unique_ptr<PrefService> PrefServiceFactory::Create( | 43 std::unique_ptr<PrefService> PrefServiceFactory::Create( |
| 44 PrefRegistry* pref_registry) { | 44 PrefRegistry* pref_registry) { |
| 45 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); | 45 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); |
| 46 std::unique_ptr<PrefService> pref_service(new PrefService( | 46 std::unique_ptr<PrefService> pref_service(new PrefService( |
| 47 pref_notifier, | 47 pref_notifier, |
| 48 new PrefValueStore(managed_prefs_.get(), supervised_user_prefs_.get(), | 48 new PrefValueStore(managed_prefs_.get(), supervised_user_prefs_.get(), |
| 49 extension_prefs_.get(), command_line_prefs_.get(), | 49 extension_prefs_.get(), command_line_prefs_.get(), |
| 50 user_prefs_.get(), recommended_prefs_.get(), | 50 user_prefs_.get(), recommended_prefs_.get(), |
| 51 pref_registry->defaults().get(), pref_notifier), | 51 pref_registry->defaults().get(), pref_notifier), |
| 52 user_prefs_.get(), pref_registry, read_error_callback_, async_)); | 52 user_prefs_.get(), pref_registry, read_error_callback_, async_)); |
| 53 // TODO(tibell): Connect and register. |
| 53 return pref_service; | 54 return pref_service; |
| 54 } | 55 } |
| OLD | NEW |