Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / profile_sync_components_factory_impl.cc

diff --git a/src/chrome/browser/sync/profile_sync_components_factory_impl.cc b/src/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 15b3e85..517216b 100644 (file)
--- a/src/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/src/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -48,8 +48,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"
@@ -70,6 +68,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"
@@ -358,7 +362,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),