| 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/syncable_prefs/pref_service_syncable_factory.h" | 5 #include "components/syncable_prefs/pref_service_syncable_factory.h" |
| 6 | 6 |
| 7 #include "base/prefs/default_pref_store.h" | 7 #include "base/prefs/default_pref_store.h" |
| 8 #include "base/prefs/pref_notifier_impl.h" | 8 #include "base/prefs/pref_notifier_impl.h" |
| 9 #include "base/prefs/pref_value_store.h" | 9 #include "base/prefs/pref_value_store.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 command_line_prefs_.get(), | 60 command_line_prefs_.get(), |
| 61 user_prefs_.get(), | 61 user_prefs_.get(), |
| 62 recommended_prefs_.get(), | 62 recommended_prefs_.get(), |
| 63 pref_registry->defaults().get(), | 63 pref_registry->defaults().get(), |
| 64 pref_notifier), | 64 pref_notifier), |
| 65 user_prefs_.get(), | 65 user_prefs_.get(), |
| 66 pref_registry, | 66 pref_registry, |
| 67 pref_model_associator_client_, | 67 pref_model_associator_client_, |
| 68 read_error_callback_, | 68 read_error_callback_, |
| 69 async_)); | 69 async_)); |
| 70 return pref_service.Pass(); | 70 return pref_service; |
| 71 } | 71 } |
| 72 | 72 |
| 73 } // namespace syncable_prefs | 73 } // namespace syncable_prefs |
| OLD | NEW |