| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 8f42150c14cb10fbdedc544e029dab66628fb3e6..6af2514dc8400e2710522d8660a74a3d8d30076f 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -109,7 +109,6 @@
|
|
|
| #if defined(ENABLE_EXTENSIONS)
|
| #include "chrome/browser/accessibility/animation_policy_prefs.h"
|
| -#include "chrome/browser/apps/drive/drive_app_mapping.h"
|
| #include "chrome/browser/apps/shortcut_manager.h"
|
| #include "chrome/browser/extensions/activity_log/activity_log.h"
|
| #include "chrome/browser/extensions/api/commands/command_service.h"
|
| @@ -230,6 +229,10 @@
|
| #include "chrome/browser/ui/startup/default_browser_prompt.h"
|
| #endif
|
|
|
| +#if defined(ENABLE_APP_LIST)
|
| +#include "chrome/browser/apps/drive/drive_app_mapping.h"
|
| +#endif
|
| +
|
| namespace {
|
|
|
| #if defined(OS_WIN)
|
| @@ -517,7 +520,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| AppShortcutManager::RegisterProfilePrefs(registry);
|
| DeviceIDFetcher::RegisterProfilePrefs(registry);
|
| DevToolsWindow::RegisterProfilePrefs(registry);
|
| +#if defined(ENABLE_APP_LIST)
|
| DriveAppMapping::RegisterProfilePrefs(registry);
|
| +#endif
|
| extensions::CommandService::RegisterProfilePrefs(registry);
|
| extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
|
| extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
|
|
|