| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 9b1e6cd86dd754401c91d22013d21c33cab18cf3..b3a8bf944365a4ca6410b39ed5dd797aa55bbb8f 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -105,7 +105,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"
|
| @@ -226,6 +225,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)
|
| @@ -504,7 +507,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);
|
|
|