diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-09-18 02:47:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 09:48:29 +0000 |
| commit | 50c1e529587af459c14828ebe48d2e018d4b8e98 (patch) | |
| tree | fce899626a1def4c171c4e348101d67746058eca /chrome/browser/prefs/chrome_pref_service_factory.cc | |
| parent | c956799bbab4a8ef3c3f223f5179847a89d2eda1 (diff) | |
| download | chromium_src-50c1e529587af459c14828ebe48d2e018d4b8e98.zip chromium_src-50c1e529587af459c14828ebe48d2e018d4b8e98.tar.gz chromium_src-50c1e529587af459c14828ebe48d2e018d4b8e98.tar.bz2 | |
Add syncable_prefs namespace.
Move all the code in the syncable_prefs components into the namespace
syncable_prefs and fix usage.
Change automated with tools/git/mffr.py with manual fixes for the
class forward-declaration.
BUG=520542
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1353913003
Cr-Commit-Position: refs/heads/master@{#349638}
Diffstat (limited to 'chrome/browser/prefs/chrome_pref_service_factory.cc')
| -rw-r--r-- | chrome/browser/prefs/chrome_pref_service_factory.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index c1935c9..95f26a0 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -420,7 +420,7 @@ scoped_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager( } void PrepareFactory( - PrefServiceSyncableFactory* factory, + syncable_prefs::PrefServiceSyncableFactory* factory, policy::PolicyService* policy_service, SupervisedUserSettingsService* supervised_user_settings, scoped_refptr<PersistentPrefStore> user_pref_store, @@ -478,7 +478,7 @@ scoped_ptr<PrefService> CreateLocalState( policy::PolicyService* policy_service, const scoped_refptr<PrefRegistry>& pref_registry, bool async) { - PrefServiceSyncableFactory factory; + syncable_prefs::PrefServiceSyncableFactory factory; PrepareFactory( &factory, policy_service, @@ -490,7 +490,7 @@ scoped_ptr<PrefService> CreateLocalState( return factory.Create(pref_registry.get()); } -scoped_ptr<PrefServiceSyncable> CreateProfilePrefs( +scoped_ptr<syncable_prefs::PrefServiceSyncable> CreateProfilePrefs( const base::FilePath& profile_path, base::SequencedTaskRunner* pref_io_task_runner, TrackedPreferenceValidationDelegate* validation_delegate, @@ -512,7 +512,7 @@ scoped_ptr<PrefServiceSyncable> CreateProfilePrefs( base::Bind(sync_start_util::GetFlareForSyncableService(profile_path), syncer::PREFERENCES); - PrefServiceSyncableFactory factory; + syncable_prefs::PrefServiceSyncableFactory factory; scoped_refptr<PersistentPrefStore> user_pref_store( CreateProfilePrefStoreManager(profile_path) ->CreateProfilePrefStore(pref_io_task_runner, @@ -524,7 +524,7 @@ scoped_ptr<PrefServiceSyncable> CreateProfilePrefs( user_pref_store, extension_prefs, async); - scoped_ptr<PrefServiceSyncable> pref_service = + scoped_ptr<syncable_prefs::PrefServiceSyncable> pref_service = factory.CreateSyncable(pref_registry.get()); ConfigureDefaultSearchPrefMigrationToDictionaryValue(pref_service.get()); |