| 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 "base/prefs/pref_service_factory.h" | 5 #include "base/prefs/pref_service_factory.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/prefs/default_pref_store.h" | 8 #include "base/prefs/default_pref_store.h" |
| 9 #include "base/prefs/json_pref_store.h" | 9 #include "base/prefs/json_pref_store.h" |
| 10 #include "base/prefs/pref_filter.h" | 10 #include "base/prefs/pref_filter.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 extension_prefs_.get(), | 52 extension_prefs_.get(), |
| 53 command_line_prefs_.get(), | 53 command_line_prefs_.get(), |
| 54 user_prefs_.get(), | 54 user_prefs_.get(), |
| 55 recommended_prefs_.get(), | 55 recommended_prefs_.get(), |
| 56 pref_registry->defaults().get(), | 56 pref_registry->defaults().get(), |
| 57 pref_notifier), | 57 pref_notifier), |
| 58 user_prefs_.get(), | 58 user_prefs_.get(), |
| 59 pref_registry, | 59 pref_registry, |
| 60 read_error_callback_, | 60 read_error_callback_, |
| 61 async_)); | 61 async_)); |
| 62 return pref_service.Pass(); | 62 return pref_service; |
| 63 } | 63 } |
| 64 | 64 |
| 65 } // namespace base | 65 } // namespace base |
| OLD | NEW |