| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extensions/app_sync_bundle.h" | 5 #include "chrome/browser/extensions/app_sync_bundle.h" |
| 6 | 6 |
| 7 #include "base/location.h" | 7 #include "base/location.h" |
| 8 #include "chrome/browser/extensions/extension_sync_service.h" | 8 #include "chrome/browser/extensions/extension_sync_service.h" |
| 9 #include "chrome/common/extensions/sync_helper.h" | 9 #include "chrome/common/extensions/sync_helper.h" |
| 10 #include "extensions/browser/app_sorting.h" | 10 #include "extensions/browser/app_sorting.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 | 52 |
| 53 void AppSyncBundle::ProcessDeletion(std::string extension_id, | 53 void AppSyncBundle::ProcessDeletion(std::string extension_id, |
| 54 const syncer::SyncChange& sync_change) { | 54 const syncer::SyncChange& sync_change) { |
| 55 RemoveApp(extension_id); | 55 RemoveApp(extension_id); |
| 56 sync_processor_->ProcessSyncChanges(FROM_HERE, | 56 sync_processor_->ProcessSyncChanges(FROM_HERE, |
| 57 syncer::SyncChangeList(1, sync_change)); | 57 syncer::SyncChangeList(1, sync_change)); |
| 58 } | 58 } |
| 59 | 59 |
| 60 syncer::SyncChange AppSyncBundle::CreateSyncChange( | 60 syncer::SyncChange AppSyncBundle::CreateSyncChange( |
| 61 const syncer::SyncData& sync_data) { | 61 const syncer::SyncData& sync_data) { |
| 62 if (HasExtensionId(sync_data.GetTag())) { | 62 if (HasExtensionId(sync_data.AsLocal().GetTag())) { |
| 63 return syncer::SyncChange(FROM_HERE, | 63 return syncer::SyncChange(FROM_HERE, |
| 64 syncer::SyncChange::ACTION_UPDATE, | 64 syncer::SyncChange::ACTION_UPDATE, |
| 65 sync_data); | 65 sync_data); |
| 66 } else { | 66 } else { |
| 67 AddApp(sync_data.GetTag()); | 67 AddApp(sync_data.AsLocal().GetTag()); |
| 68 return syncer::SyncChange(FROM_HERE, | 68 return syncer::SyncChange(FROM_HERE, |
| 69 syncer::SyncChange::ACTION_ADD, | 69 syncer::SyncChange::ACTION_ADD, |
| 70 sync_data); | 70 sync_data); |
| 71 } | 71 } |
| 72 } | 72 } |
| 73 | 73 |
| 74 syncer::SyncDataList AppSyncBundle::GetAllSyncData() const { | 74 syncer::SyncDataList AppSyncBundle::GetAllSyncData() const { |
| 75 std::vector<AppSyncData> app_sync_data = | 75 std::vector<AppSyncData> app_sync_data = |
| 76 extension_sync_service_->GetAppSyncDataList(); | 76 extension_sync_service_->GetAppSyncDataList(); |
| 77 syncer::SyncDataList result(app_sync_data.size()); | 77 syncer::SyncDataList result(app_sync_data.size()); |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 } | 162 } |
| 163 | 163 |
| 164 | 164 |
| 165 void AppSyncBundle::MarkPendingAppSynced(const std::string& id) { | 165 void AppSyncBundle::MarkPendingAppSynced(const std::string& id) { |
| 166 pending_sync_data_.erase(id); | 166 pending_sync_data_.erase(id); |
| 167 synced_apps_.insert(id); | 167 synced_apps_.insert(id); |
| 168 } | 168 } |
| 169 | 169 |
| 170 | 170 |
| 171 } // namespace extensions | 171 } // namespace extensions |
| OLD | NEW |