Index: chrome/browser/prefs/browser_prefs.cc |
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc |
index a63e57e4ff81948d36168b66a2470391ce8269f4..1b12bd2e51a17408ee6871b87cbd798c711f4266 100644 |
--- a/chrome/browser/prefs/browser_prefs.cc |
+++ b/chrome/browser/prefs/browser_prefs.cc |
@@ -62,7 +62,7 @@ |
#include "chrome/browser/task_manager/task_manager.h" |
#include "chrome/browser/translate/translate_prefs.h" |
#include "chrome/browser/ui/alternate_error_tab_observer.h" |
-#include "chrome/browser/ui/app_list/app_list_util.h" |
+#include "chrome/browser/ui/app_list/app_list_service.h" |
#include "chrome/browser/ui/browser_instant_controller.h" |
#include "chrome/browser/ui/browser_ui_prefs.h" |
#include "chrome/browser/ui/network_profile_bubble.h" |
@@ -160,6 +160,7 @@ void RegisterLocalState(PrefService* local_state, |
registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
// Please keep this list alphabetized. |
+ AppListService::RegisterAppListPrefs(registry); |
benwells
2013/02/19 07:34:28
nit: This function should just become RegisterPref
tapted
2013/02/20 04:15:07
Done.
|
apps::RegisterPrefs(registry); |
browser_shutdown::RegisterPrefs(registry); |
BrowserProcessImpl::RegisterPrefs(registry); |
@@ -233,10 +234,6 @@ void RegisterLocalState(PrefService* local_state, |
#if defined(OS_MACOSX) |
confirm_quit::RegisterLocalState(registry); |
#endif |
- |
-#if defined(ENABLE_SETTINGS_APP) |
- chrome::RegisterAppListPrefs(registry); |
-#endif |
} |
void RegisterUserPrefs(PrefService* user_prefs, |