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

Unified Diff: chrome/browser/sync/chrome_sync_client.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/sync/chrome_sync_client.cc
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index a549fbb4c3484a63e1a4731418289a2a7dfc8ea4..9bf1459788f85cab5d8ee3628243ca2298486b05 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -66,7 +66,7 @@
#include "content/public/browser/browser_thread.h"
#include "ui/base/device_form_factor.h"
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
#include "chrome/browser/ui/app_list/app_list_syncable_service.h"
#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
#include "ui/app_list/app_list_switches.h"
@@ -338,7 +338,7 @@ ChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
return extensions::settings_sync_util::GetSyncableService(profile_, type)
->AsWeakPtr();
#endif
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
case syncer::APP_LIST:
return app_list::AppListSyncableServiceFactory::GetForProfile(profile_)->
AsWeakPtr();
@@ -569,7 +569,7 @@ void ChromeSyncClient::RegisterDesktopDataTypes(
}
#endif
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
if (app_list::switches::IsAppListSyncEnabled()) {
sync_service->RegisterDataTypeController(
base::MakeUnique<UIDataTypeController>(syncer::APP_LIST, error_callback,
« no previous file with comments | « chrome/browser/shell_integration_linux.cc ('k') | chrome/browser/sync/profile_sync_service_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698