| 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/pref_service_syncable_builder.h" | 5 #include "chrome/browser/prefs/pref_service_syncable_builder.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" |
| 7 #include "base/prefs/default_pref_store.h" | 8 #include "base/prefs/default_pref_store.h" |
| 8 #include "base/prefs/pref_notifier_impl.h" | 9 #include "base/prefs/pref_notifier_impl.h" |
| 9 #include "base/prefs/pref_value_store.h" | 10 #include "base/prefs/pref_value_store.h" |
| 10 #include "chrome/browser/policy/configuration_policy_pref_store.h" | 11 #include "chrome/browser/policy/configuration_policy_pref_store.h" |
| 11 #include "chrome/browser/policy/policy_service.h" | 12 #include "chrome/browser/policy/policy_service.h" |
| 12 #include "chrome/browser/prefs/command_line_pref_store.h" | 13 #include "chrome/browser/prefs/command_line_pref_store.h" |
| 13 #include "chrome/browser/prefs/pref_service_syncable.h" | 14 #include "chrome/browser/prefs/pref_service_syncable.h" |
| 14 #include "components/user_prefs/pref_registry_syncable.h" | 15 #include "components/user_prefs/pref_registry_syncable.h" |
| 15 | 16 |
| 16 PrefServiceSyncableBuilder::PrefServiceSyncableBuilder() { | 17 PrefServiceSyncableBuilder::PrefServiceSyncableBuilder() { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 36 #endif | 37 #endif |
| 37 | 38 |
| 38 PrefServiceSyncableBuilder& | 39 PrefServiceSyncableBuilder& |
| 39 PrefServiceSyncableBuilder::WithCommandLine(CommandLine* command_line) { | 40 PrefServiceSyncableBuilder::WithCommandLine(CommandLine* command_line) { |
| 40 WithCommandLinePrefs(new CommandLinePrefStore(command_line)); | 41 WithCommandLinePrefs(new CommandLinePrefStore(command_line)); |
| 41 return *this; | 42 return *this; |
| 42 } | 43 } |
| 43 | 44 |
| 44 PrefServiceSyncable* PrefServiceSyncableBuilder::CreateSyncable( | 45 PrefServiceSyncable* PrefServiceSyncableBuilder::CreateSyncable( |
| 45 user_prefs::PrefRegistrySyncable* pref_registry) { | 46 user_prefs::PrefRegistrySyncable* pref_registry) { |
| 47 TRACE_EVENT0("browser", "PrefServiceSyncableBuilder::CreateSyncable") |
| 46 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); | 48 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); |
| 47 PrefServiceSyncable* pref_service = new PrefServiceSyncable( | 49 PrefServiceSyncable* pref_service = new PrefServiceSyncable( |
| 48 pref_notifier, | 50 pref_notifier, |
| 49 new PrefValueStore( | 51 new PrefValueStore( |
| 50 managed_prefs_.get(), | 52 managed_prefs_.get(), |
| 51 extension_prefs_.get(), | 53 extension_prefs_.get(), |
| 52 command_line_prefs_.get(), | 54 command_line_prefs_.get(), |
| 53 user_prefs_.get(), | 55 user_prefs_.get(), |
| 54 recommended_prefs_.get(), | 56 recommended_prefs_.get(), |
| 55 pref_registry->defaults(), | 57 pref_registry->defaults(), |
| 56 pref_notifier), | 58 pref_notifier), |
| 57 user_prefs_.get(), | 59 user_prefs_.get(), |
| 58 pref_registry, | 60 pref_registry, |
| 59 read_error_callback_, | 61 read_error_callback_, |
| 60 async_); | 62 async_); |
| 61 ResetDefaultState(); | 63 ResetDefaultState(); |
| 62 return pref_service; | 64 return pref_service; |
| 63 } | 65 } |
| OLD | NEW |