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

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

Issue 12256040: Second batch of fixing prefs registrations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for commit. 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 95943284b1db3bc02c0ba655aa55dfeacb566662..af73e99ecead7a85d23a74debc4375b6668520bc 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -63,6 +63,7 @@
#include "chrome/browser/renderer_host/web_cache_manager.h"
#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
#include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/sync/invalidations/invalidator_storage.h"
#include "chrome/browser/sync/sync_prefs.h"
#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/browser/translate/translate_prefs.h"
@@ -275,6 +276,7 @@ void RegisterUserPrefs(PrefService* user_prefs,
HostContentSettingsMap::RegisterUserPrefs(registry);
IncognitoModePrefs::RegisterUserPrefs(registry);
InstantUI::RegisterUserPrefs(registry);
+ browser_sync::InvalidatorStorage::RegisterUserPrefs(registry);
MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry);
MediaStreamDevicesController::RegisterUserPrefs(registry);
NetPrefObserver::RegisterUserPrefs(registry);
@@ -305,7 +307,7 @@ void RegisterUserPrefs(PrefService* user_prefs,
#if defined(TOOLKIT_VIEWS)
RegisterInvertBubbleUserPrefs(registry);
#elif defined(TOOLKIT_GTK)
- BrowserWindowGtk::RegisterUserPrefs(user_prefs, registry);
+ BrowserWindowGtk::RegisterUserPrefs(registry);
#endif
#if defined(OS_ANDROID)
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/sync/glue/sync_backend_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698