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

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

Issue 1861233003: Prepare for building with enable_app_list=0 on Desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: drop patchset dependency, rebase to master Created 4 years, 8 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 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);

Powered by Google App Engine
This is Rietveld 408576698