Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7052)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 12315053: Fix prefs registration in SyncPrefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment change. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/prefs/browser_prefs.cc ('K') | « chrome/browser/prefs/proxy_policy_unittest.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 9f6685ea9a3c469a6047c80d423fdea140694695..0a673a7deb0ac97181df327853d6f5ae5babeb78 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -388,6 +388,7 @@ ProfileImpl::ProfileImpl(
create_mode == CREATE_MODE_SYNCHRONOUS);
bool async_prefs = create_mode == CREATE_MODE_ASYNCHRONOUS;
+ chrome::RegisterUserPrefs(pref_registry_);
Profile::RegisterUserPrefs(pref_registry_);
Mattias Nissler (ping if slow) 2013/02/22 15:44:32 Suggestion: move this call into chrome::RegisterUs
Jói 2013/02/22 16:08:07 Done.
{
@@ -709,10 +710,6 @@ void ProfileImpl::OnPrefsLoaded(bool success) {
return;
}
- // TODO(joi): Registration can move to the constructor once it
- // doesn't need the PrefService parameter.
- chrome::RegisterUserPrefs(prefs_.get(), pref_registry_);
-
// TODO(mirandac): remove migration code after 6 months (crbug.com/69995).
if (g_browser_process->local_state())
chrome::MigrateBrowserPrefs(this, g_browser_process->local_state());
« chrome/browser/prefs/browser_prefs.cc ('K') | « chrome/browser/prefs/proxy_policy_unittest.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698