| Index: chrome/browser/ui/app_list/app_list_syncable_service.cc
|
| diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc
|
| index 9983c6bdc3a19a94dad7d10fe451e3f5d762f9b4..7f552ddcc99e7b33c0d67fc24989e848d585a458 100644
|
| --- a/chrome/browser/ui/app_list/app_list_syncable_service.cc
|
| +++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc
|
| @@ -483,6 +483,8 @@ syncer::SyncMergeResult AppListSyncableService::MergeDataAndStartSyncing(
|
|
|
| sync_processor_ = sync_processor.Pass();
|
| sync_error_handler_ = error_handler.Pass();
|
| + if (switches::IsFolderUIEnabled())
|
| + model_->SetFoldersEnabled(true);
|
|
|
| syncer::SyncMergeResult result = syncer::SyncMergeResult(type);
|
| result.set_num_items_before_association(sync_items_.size());
|
| @@ -548,6 +550,7 @@ void AppListSyncableService::StopSyncing(syncer::ModelType type) {
|
|
|
| sync_processor_.reset();
|
| sync_error_handler_.reset();
|
| + model_->SetFoldersEnabled(false);
|
| }
|
|
|
| syncer::SyncDataList AppListSyncableService::GetAllSyncData(
|
|
|