| 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" |
| 11 #include "components/prefs/pref_filter.h" | 11 #include "components/prefs/pref_filter.h" |
| 12 #include "components/prefs/pref_notifier_impl.h" | 12 #include "components/prefs/pref_notifier_impl.h" |
| 13 #include "components/prefs/pref_service.h" | 13 #include "components/prefs/pref_service.h" |
| 14 #include "components/prefs/pref_value_store.h" | 14 #include "components/prefs/pref_value_store.h" |
| 15 | 15 |
| 16 namespace base { | |
| 17 | |
| 18 namespace { | 16 namespace { |
| 19 | 17 |
| 20 // Do-nothing default implementation. | 18 // Do-nothing default implementation. |
| 21 void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) { | 19 void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) { |
| 22 } | 20 } |
| 23 | 21 |
| 24 } // namespace | 22 } // namespace |
| 25 | 23 |
| 26 PrefServiceFactory::PrefServiceFactory() | 24 PrefServiceFactory::PrefServiceFactory() |
| 27 : managed_prefs_(NULL), | 25 : managed_prefs_(NULL), |
| (...skipping 26 matching lines...) Expand all Loading... |
| 54 user_prefs_.get(), | 52 user_prefs_.get(), |
| 55 recommended_prefs_.get(), | 53 recommended_prefs_.get(), |
| 56 pref_registry->defaults().get(), | 54 pref_registry->defaults().get(), |
| 57 pref_notifier), | 55 pref_notifier), |
| 58 user_prefs_.get(), | 56 user_prefs_.get(), |
| 59 pref_registry, | 57 pref_registry, |
| 60 read_error_callback_, | 58 read_error_callback_, |
| 61 async_)); | 59 async_)); |
| 62 return pref_service; | 60 return pref_service; |
| 63 } | 61 } |
| 64 | |
| 65 } // namespace base | |
| OLD | NEW |