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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 12315053: Fix prefs registration in SyncPrefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index e671e318abf23fba74aadb1e1801a258560868b7..dac9cced7768f0594dc5a01256095d0cb1d7e4bb 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -58,6 +58,7 @@
#include "chrome/browser/printing/cloud_print/cloud_print_url.h"
#include "chrome/browser/printing/print_dialog_cloud.h"
#include "chrome/browser/profiles/chrome_version_service.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_impl.h"
#include "chrome/browser/profiles/profile_info_cache.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -269,7 +270,7 @@ void RegisterUserPrefs(PrefService* user_prefs,
BookmarkPromptPrefs::RegisterUserPrefs(registry);
bookmark_utils::RegisterUserPrefs(registry);
BrowserInstantController::RegisterUserPrefs(user_prefs, registry);
- browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs, registry);
+ browser_sync::SyncPrefs::RegisterUserPrefs(registry);
ChromeContentBrowserClient::RegisterUserPrefs(registry);
ChromeDownloadManagerDelegate::RegisterUserPrefs(registry);
ChromeVersionService::RegisterUserPrefs(registry);
@@ -292,6 +293,7 @@ void RegisterUserPrefs(PrefService* user_prefs,
PasswordManager::RegisterUserPrefs(registry);
PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry);
PrefsTabHelper::RegisterUserPrefs(registry);
+ Profile::RegisterUserPrefs(registry);
ProfileImpl::RegisterUserPrefs(registry);
PromoResourceService::RegisterUserPrefs(registry);
ProtocolHandlerRegistry::RegisterUserPrefs(registry);
« no previous file with comments | « chrome/browser/policy/user_policy_signin_service_unittest.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698