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

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

Issue 2406303003: Move enable_app_list to a buildflag. (Closed)
Patch Set: More grit defines Created 4 years, 2 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 78a335928f6ebe5047e75754ef1e3aef432afdb6..92b92d76cb5c5d45cf3c5d6d8c8c6cc2a4b72f18 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -107,7 +107,7 @@
#include "content/public/browser/render_process_host.h"
#include "net/http/http_server_properties_manager.h"
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
#include "chrome/browser/apps/drive/drive_app_mapping.h"
#endif
@@ -216,7 +216,7 @@
#include "chrome/browser/extensions/default_apps.h"
#endif
-#if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
+#if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
#endif
@@ -503,7 +503,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
ZeroSuggestProvider::RegisterProfilePrefs(registry);
browsing_data::prefs::RegisterBrowserUserPrefs(registry);
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
app_list::AppListPrefs::RegisterProfilePrefs(registry);
#endif
@@ -565,7 +565,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
AppShortcutManager::RegisterProfilePrefs(registry);
DeviceIDFetcher::RegisterProfilePrefs(registry);
DevToolsWindow::RegisterProfilePrefs(registry);
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
DriveAppMapping::RegisterProfilePrefs(registry);
#endif
extensions::CommandService::RegisterProfilePrefs(registry);
@@ -608,7 +608,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry);
#endif
-#if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
+#if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
ArcAppListPrefs::RegisterProfilePrefs(registry);
#endif

Powered by Google App Engine
This is Rietveld 408576698