| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/profile_pref_store_manager.h" | 5 #include "chrome/browser/prefs/profile_pref_store_manager.h" | 
| 6 | 6 | 
| 7 #include <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "base/bind.h" | 9 #include "base/bind.h" | 
| 10 #include "base/callback.h" | 10 #include "base/callback.h" | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 105 | 105 | 
| 106 PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore( | 106 PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore( | 
| 107     const scoped_refptr<base::SequencedTaskRunner>& io_task_runner, | 107     const scoped_refptr<base::SequencedTaskRunner>& io_task_runner, | 
| 108     const base::Closure& on_reset_on_load, | 108     const base::Closure& on_reset_on_load, | 
| 109     prefs::mojom::TrackedPreferenceValidationDelegate* validation_delegate, | 109     prefs::mojom::TrackedPreferenceValidationDelegate* validation_delegate, | 
| 110     service_manager::Connector* connector, | 110     service_manager::Connector* connector, | 
| 111     scoped_refptr<PrefRegistry> pref_registry) { | 111     scoped_refptr<PrefRegistry> pref_registry) { | 
| 112   if (features::PrefServiceEnabled()) { | 112   if (features::PrefServiceEnabled()) { | 
| 113     ConfigurePrefService(on_reset_on_load, connector); | 113     ConfigurePrefService(on_reset_on_load, connector); | 
| 114     prefs::mojom::PrefStoreConnectorPtr pref_connector; | 114     prefs::mojom::PrefStoreConnectorPtr pref_connector; | 
| 115     connector->BindInterface(prefs::mojom::kPrefStoreServiceName, | 115     connector->BindInterface(prefs::mojom::kServiceName, &pref_connector); | 
| 116                              &pref_connector); |  | 
| 117     return new prefs::PersistentPrefStoreClient(std::move(pref_connector), | 116     return new prefs::PersistentPrefStoreClient(std::move(pref_connector), | 
| 118                                                 std::move(pref_registry)); | 117                                                 std::move(pref_registry)); | 
| 119   } | 118   } | 
| 120   if (!kPlatformSupportsPreferenceTracking) { | 119   if (!kPlatformSupportsPreferenceTracking) { | 
| 121     return new JsonPrefStore(profile_path_.Append(chrome::kPreferencesFilename), | 120     return new JsonPrefStore(profile_path_.Append(chrome::kPreferencesFilename), | 
| 122                              io_task_runner.get(), | 121                              io_task_runner.get(), | 
| 123                              std::unique_ptr<PrefFilter>()); | 122                              std::unique_ptr<PrefFilter>()); | 
| 124   } | 123   } | 
| 125 | 124 | 
| 126   std::vector<PrefHashFilter::TrackedPreferenceMetadata> | 125   std::vector<PrefHashFilter::TrackedPreferenceMetadata> | 
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 240 } | 239 } | 
| 241 | 240 | 
| 242 void ProfilePrefStoreManager::ConfigurePrefService( | 241 void ProfilePrefStoreManager::ConfigurePrefService( | 
| 243     const base::Closure& on_reset_on_load, | 242     const base::Closure& on_reset_on_load, | 
| 244     service_manager::Connector* connector) { | 243     service_manager::Connector* connector) { | 
| 245   auto config = prefs::mojom::PersistentPrefStoreConfiguration::New(); | 244   auto config = prefs::mojom::PersistentPrefStoreConfiguration::New(); | 
| 246   config->set_simple_configuration( | 245   config->set_simple_configuration( | 
| 247       prefs::mojom::SimplePersistentPrefStoreConfiguration::New( | 246       prefs::mojom::SimplePersistentPrefStoreConfiguration::New( | 
| 248           profile_path_.Append(chrome::kPreferencesFilename))); | 247           profile_path_.Append(chrome::kPreferencesFilename))); | 
| 249   prefs::mojom::PrefServiceControlPtr control; | 248   prefs::mojom::PrefServiceControlPtr control; | 
| 250   connector->BindInterface(prefs::mojom::kPrefStoreServiceName, &control); | 249   connector->BindInterface(prefs::mojom::kServiceName, &control); | 
| 251   control->Init(std::move(config)); | 250   control->Init(std::move(config)); | 
| 252 } | 251 } | 
| OLD | NEW | 
|---|