OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" | 5 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 model_->SetItemName(oem_folder, oem_folder_name_); | 354 model_->SetItemName(oem_folder, oem_folder_name_); |
355 } | 355 } |
356 | 356 |
357 AppListModel* AppListSyncableService::GetModel() { | 357 AppListModel* AppListSyncableService::GetModel() { |
358 if (!apps_builder_) | 358 if (!apps_builder_) |
359 BuildModel(); | 359 BuildModel(); |
360 | 360 |
361 return model_.get(); | 361 return model_.get(); |
362 } | 362 } |
363 | 363 |
364 void AppListSyncableService::AddItem(scoped_ptr<AppListItem> app_item) { | 364 void AppListSyncableService::AddItem(std::unique_ptr<AppListItem> app_item) { |
365 SyncItem* sync_item = FindOrAddSyncItem(app_item.get()); | 365 SyncItem* sync_item = FindOrAddSyncItem(app_item.get()); |
366 if (!sync_item) | 366 if (!sync_item) |
367 return; // Item is not valid. | 367 return; // Item is not valid. |
368 | 368 |
369 std::string folder_id; | 369 std::string folder_id; |
370 if (app_list::switches::IsFolderUIEnabled()) { | 370 if (app_list::switches::IsFolderUIEnabled()) { |
371 if (AppIsOem(app_item->id())) { | 371 if (AppIsOem(app_item->id())) { |
372 folder_id = FindOrCreateOemFolder(); | 372 folder_id = FindOrCreateOemFolder(); |
373 VLOG_IF(2, !folder_id.empty()) | 373 VLOG_IF(2, !folder_id.empty()) |
374 << this << ": AddItem to OEM folder: " << sync_item->ToString(); | 374 << this << ": AddItem to OEM folder: " << sync_item->ToString(); |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 if (!ContainsKey(parent_ids, sync_item->item_id)) | 579 if (!ContainsKey(parent_ids, sync_item->item_id)) |
580 DeleteSyncItem(sync_item); | 580 DeleteSyncItem(sync_item); |
581 } | 581 } |
582 } | 582 } |
583 | 583 |
584 // AppListSyncableService syncer::SyncableService | 584 // AppListSyncableService syncer::SyncableService |
585 | 585 |
586 syncer::SyncMergeResult AppListSyncableService::MergeDataAndStartSyncing( | 586 syncer::SyncMergeResult AppListSyncableService::MergeDataAndStartSyncing( |
587 syncer::ModelType type, | 587 syncer::ModelType type, |
588 const syncer::SyncDataList& initial_sync_data, | 588 const syncer::SyncDataList& initial_sync_data, |
589 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, | 589 std::unique_ptr<syncer::SyncChangeProcessor> sync_processor, |
590 scoped_ptr<syncer::SyncErrorFactory> error_handler) { | 590 std::unique_ptr<syncer::SyncErrorFactory> error_handler) { |
591 DCHECK(!sync_processor_.get()); | 591 DCHECK(!sync_processor_.get()); |
592 DCHECK(sync_processor.get()); | 592 DCHECK(sync_processor.get()); |
593 DCHECK(error_handler.get()); | 593 DCHECK(error_handler.get()); |
594 | 594 |
595 // Ensure the model is built. | 595 // Ensure the model is built. |
596 GetModel(); | 596 GetModel(); |
597 | 597 |
598 sync_processor_ = std::move(sync_processor); | 598 sync_processor_ = std::move(sync_processor); |
599 sync_error_handler_ = std::move(error_handler); | 599 sync_error_handler_ = std::move(error_handler); |
600 if (switches::IsFolderUIEnabled()) | 600 if (switches::IsFolderUIEnabled()) |
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
923 if (IsDriveAppSyncId(item_id) && drive_app_provider_) { | 923 if (IsDriveAppSyncId(item_id) && drive_app_provider_) { |
924 drive_app_provider_->RemoveUninstalledDriveAppFromSync( | 924 drive_app_provider_->RemoveUninstalledDriveAppFromSync( |
925 GetDriveAppIdFromSyncId(item_id)); | 925 GetDriveAppIdFromSyncId(item_id)); |
926 } | 926 } |
927 } | 927 } |
928 } | 928 } |
929 | 929 |
930 std::string AppListSyncableService::FindOrCreateOemFolder() { | 930 std::string AppListSyncableService::FindOrCreateOemFolder() { |
931 AppListFolderItem* oem_folder = model_->FindFolderItem(kOemFolderId); | 931 AppListFolderItem* oem_folder = model_->FindFolderItem(kOemFolderId); |
932 if (!oem_folder) { | 932 if (!oem_folder) { |
933 scoped_ptr<AppListFolderItem> new_folder(new AppListFolderItem( | 933 std::unique_ptr<AppListFolderItem> new_folder(new AppListFolderItem( |
934 kOemFolderId, AppListFolderItem::FOLDER_TYPE_OEM)); | 934 kOemFolderId, AppListFolderItem::FOLDER_TYPE_OEM)); |
935 oem_folder = | 935 oem_folder = |
936 static_cast<AppListFolderItem*>(model_->AddItem(std::move(new_folder))); | 936 static_cast<AppListFolderItem*>(model_->AddItem(std::move(new_folder))); |
937 SyncItem* oem_sync_item = FindSyncItem(kOemFolderId); | 937 SyncItem* oem_sync_item = FindSyncItem(kOemFolderId); |
938 if (oem_sync_item) { | 938 if (oem_sync_item) { |
939 VLOG(1) << "Creating OEM folder from existing sync item: " | 939 VLOG(1) << "Creating OEM folder from existing sync item: " |
940 << oem_sync_item->item_ordinal.ToDebugString(); | 940 << oem_sync_item->item_ordinal.ToDebugString(); |
941 model_->SetItemPosition(oem_folder, oem_sync_item->item_ordinal); | 941 model_->SetItemPosition(oem_folder, oem_sync_item->item_ordinal); |
942 } else { | 942 } else { |
943 model_->SetItemPosition(oem_folder, GetOemFolderPos()); | 943 model_->SetItemPosition(oem_folder, GetOemFolderPos()); |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1008 } else { | 1008 } else { |
1009 res += " { " + item_name + " }"; | 1009 res += " { " + item_name + " }"; |
1010 res += " [" + item_ordinal.ToDebugString() + "]"; | 1010 res += " [" + item_ordinal.ToDebugString() + "]"; |
1011 if (!parent_id.empty()) | 1011 if (!parent_id.empty()) |
1012 res += " <" + parent_id.substr(0, 8) + ">"; | 1012 res += " <" + parent_id.substr(0, 8) + ">"; |
1013 } | 1013 } |
1014 return res; | 1014 return res; |
1015 } | 1015 } |
1016 | 1016 |
1017 } // namespace app_list | 1017 } // namespace app_list |
OLD | NEW |