Index: chrome/browser/extensions/app_sync_bundle.cc |
diff --git a/chrome/browser/extensions/app_sync_bundle.cc b/chrome/browser/extensions/app_sync_bundle.cc |
index 0c1bdebdeb5ac9c775ef930dc17be5918c08abc7..79bd765aa8735781a19ef2e25012a23169bac990 100644 |
--- a/chrome/browser/extensions/app_sync_bundle.cc |
+++ b/chrome/browser/extensions/app_sync_bundle.cc |
@@ -20,13 +20,13 @@ AppSyncBundle::AppSyncBundle(ExtensionService* extension_service) |
AppSyncBundle::~AppSyncBundle() {} |
-void AppSyncBundle::SetupSync(SyncChangeProcessor* sync_change_processor, |
- SyncErrorFactory* sync_error_factory, |
- const SyncDataList& initial_sync_data) { |
+void AppSyncBundle::SetupSync(csync::SyncChangeProcessor* sync_change_processor, |
+ csync::SyncErrorFactory* sync_error_factory, |
+ const csync::SyncDataList& initial_sync_data) { |
sync_processor_.reset(sync_change_processor); |
sync_error_factory_.reset(sync_error_factory); |
- for (SyncDataList::const_iterator i = initial_sync_data.begin(); |
+ for (csync::SyncDataList::const_iterator i = initial_sync_data.begin(); |
i != initial_sync_data.end(); |
++i) { |
AppSyncData app_sync_data(*i); |
@@ -42,32 +42,34 @@ void AppSyncBundle::Reset() { |
pending_sync_data_.clear(); |
} |
-SyncChange AppSyncBundle::CreateSyncChangeToDelete(const Extension* extension) |
+csync::SyncChange AppSyncBundle::CreateSyncChangeToDelete( |
+ const Extension* extension) |
const { |
AppSyncData sync_data = extension_service_->GetAppSyncData(*extension); |
- return sync_data.GetSyncChange(SyncChange::ACTION_DELETE); |
+ return sync_data.GetSyncChange(csync::SyncChange::ACTION_DELETE); |
} |
void AppSyncBundle::ProcessDeletion(std::string extension_id, |
- const SyncChange& sync_change) { |
+ const csync::SyncChange& sync_change) { |
RemoveApp(extension_id); |
sync_processor_->ProcessSyncChanges(FROM_HERE, |
- SyncChangeList(1, sync_change)); |
+ csync::SyncChangeList(1, sync_change)); |
} |
-SyncChange AppSyncBundle::CreateSyncChange(const SyncData& sync_data) { |
+csync::SyncChange AppSyncBundle::CreateSyncChange( |
+ const csync::SyncData& sync_data) { |
if (HasExtensionId(sync_data.GetTag())) { |
- return SyncChange(SyncChange::ACTION_UPDATE, sync_data); |
+ return csync::SyncChange(csync::SyncChange::ACTION_UPDATE, sync_data); |
} else { |
AddApp(sync_data.GetTag()); |
- return SyncChange(SyncChange::ACTION_ADD, sync_data); |
+ return csync::SyncChange(csync::SyncChange::ACTION_ADD, sync_data); |
} |
} |
-SyncDataList AppSyncBundle::GetAllSyncData() const { |
+csync::SyncDataList AppSyncBundle::GetAllSyncData() const { |
std::vector<AppSyncData> app_sync_data = |
extension_service_->GetAppSyncDataList(); |
- SyncDataList result(app_sync_data.size()); |
+ csync::SyncDataList result(app_sync_data.size()); |
for (int i = 0; i < static_cast<int>(app_sync_data.size()); ++i) { |
result[i] = app_sync_data[i].GetSyncData(); |
} |
@@ -77,9 +79,9 @@ SyncDataList AppSyncBundle::GetAllSyncData() const { |
void AppSyncBundle::SyncChangeIfNeeded(const Extension& extension) { |
AppSyncData app_sync_data = extension_service_->GetAppSyncData(extension); |
- SyncChangeList sync_change_list(1, app_sync_data.GetSyncChange( |
+ csync::SyncChangeList sync_change_list(1, app_sync_data.GetSyncChange( |
HasExtensionId(extension.id()) ? |
- SyncChange::ACTION_UPDATE : SyncChange::ACTION_ADD)); |
+ csync::SyncChange::ACTION_UPDATE : csync::SyncChange::ACTION_ADD)); |
sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); |
MarkPendingAppSynced(extension.id()); |
} |
@@ -92,7 +94,8 @@ void AppSyncBundle::ProcessSyncChange(AppSyncData app_sync_data) { |
extension_service_->ProcessAppSyncData(app_sync_data); |
} |
-void AppSyncBundle::ProcessSyncChangeList(SyncChangeList sync_change_list) { |
+void AppSyncBundle::ProcessSyncChangeList( |
+ csync::SyncChangeList sync_change_list) { |
sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); |
extension_service_->extension_prefs()->extension_sorting()-> |
FixNTPOrdinalCollisions(); |