| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index b1186f8816c7cf545de5557e4808737b106ef405..327c5c36af437de36d129b4c39635e9651275dde 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -69,7 +69,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"
|
| @@ -172,6 +172,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
| registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
|
|
|
| // Please keep this list alphabetized.
|
| + AppListService::RegisterPrefs(registry);
|
| apps::RegisterPrefs(registry);
|
| browser_shutdown::RegisterPrefs(registry);
|
| BrowserProcessImpl::RegisterPrefs(registry);
|
| @@ -250,10 +251,6 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
| #if defined(OS_MACOSX)
|
| confirm_quit::RegisterLocalState(registry);
|
| #endif
|
| -
|
| -#if defined(ENABLE_SETTINGS_APP)
|
| - chrome::RegisterAppListPrefs(registry);
|
| -#endif
|
| }
|
|
|
| void RegisterUserPrefs(PrefService* user_prefs,
|
|
|