Index: chrome/browser/sync/profile_sync_components_factory_impl.cc |
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc |
index f83b41ccdc72833de9c16938d27e4f76ee7b7d04..3b99402090ff6db5c41cb5ddfd7abf2a2093422d 100644 |
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc |
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc |
@@ -47,8 +47,6 @@ |
#include "chrome/browser/themes/theme_service.h" |
#include "chrome/browser/themes/theme_service_factory.h" |
#include "chrome/browser/themes/theme_syncable_service.h" |
-#include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
-#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" |
#include "chrome/browser/webdata/autocomplete_syncable_service.h" |
#include "chrome/browser/webdata/web_data_service_factory.h" |
#include "chrome/common/chrome_switches.h" |
@@ -73,6 +71,12 @@ |
#include "chrome/browser/extensions/extension_sync_service.h" |
#endif |
+#if defined(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" |
+#endif |
+ |
#if defined(ENABLE_MANAGED_USERS) |
#include "chrome/browser/managed_mode/managed_user_settings_service.h" |
#include "chrome/browser/managed_mode/managed_user_settings_service_factory.h" |
@@ -361,7 +365,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes( |
} |
#if defined(ENABLE_APP_LIST) |
- if (!command_line_->HasSwitch(switches::kDisableSyncAppList)) { |
+ if (app_list::switches::IsAppListSyncEnabled()) { |
pss->RegisterDataTypeController( |
new UIDataTypeController( |
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |