Chromium Code Reviews| Index: chrome/browser/profiles/profile_impl.cc |
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
| index d0b7789cacea1f9a9429b096fe93e04be26a7d47..7c0a6c0d750d353d0dcba7d20500c46aea4b546a 100644 |
| --- a/chrome/browser/profiles/profile_impl.cc |
| +++ b/chrome/browser/profiles/profile_impl.cc |
| @@ -61,6 +61,7 @@ |
| #include "chrome/browser/prefs/browser_prefs.h" |
| #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| #include "chrome/browser/prefs/pref_service_syncable.h" |
| +#include "chrome/browser/prefs/tracked/tracked_preference_validation_delegate.h" |
| #include "chrome/browser/prerender/prerender_manager_factory.h" |
| #include "chrome/browser/profiles/bookmark_model_loaded_observer.h" |
| #include "chrome/browser/profiles/chrome_version_service.h" |
| @@ -464,20 +465,23 @@ ProfileImpl::ProfileImpl( |
| path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS); |
| #endif |
| + // TODO(grt): construct pref_validation_delegate_. |
| { |
| // On startup, preference loading is always synchronous so a scoped timer |
| // will work here. |
| startup_metric_utils::ScopedSlowStartupUMA |
| scoped_timer("Startup.SlowStartupPreferenceLoading"); |
| prefs_ = chrome_prefs::CreateProfilePrefs( |
| - path_, |
| - sequenced_task_runner, |
| - profile_policy_connector_->policy_service(), |
| - managed_user_settings, |
| - new ExtensionPrefStore( |
| - ExtensionPrefValueMapFactory::GetForBrowserContext(this), false), |
| - pref_registry_, |
| - async_prefs).Pass(); |
| + path_, |
| + sequenced_task_runner, |
|
noms (inactive)
2014/05/26 13:38:21
I think the indenting is off on this. It should on
grt (UTC plus 2)
2014/05/26 14:30:21
"git cl format" did this for me. I've switched it
|
| + pref_validation_delegate_.get(), |
| + profile_policy_connector_->policy_service(), |
| + managed_user_settings, |
| + new ExtensionPrefStore( |
| + ExtensionPrefValueMapFactory::GetForBrowserContext(this), |
| + false), |
| + pref_registry_, |
| + async_prefs).Pass(); |
| // Register on BrowserContext. |
| user_prefs::UserPrefs::Set(this, prefs_.get()); |
| } |