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_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
9 #include "chrome/browser/extensions/extension_sorting.h" | 9 #include "chrome/browser/extensions/extension_sorting.h" |
10 #include "chrome/common/extensions/extension.h" | 10 #include "chrome/common/extensions/extension.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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.GetTag())) { |
63 return syncer::SyncChange(FROM_HERE, | 63 return syncer::SyncChange(syncer::SyncChange::ACTION_UPDATE, sync_data); |
64 syncer::SyncChange::ACTION_UPDATE, | |
65 sync_data); | |
66 } else { | 64 } else { |
67 AddApp(sync_data.GetTag()); | 65 AddApp(sync_data.GetTag()); |
68 return syncer::SyncChange(FROM_HERE, | 66 return syncer::SyncChange(syncer::SyncChange::ACTION_ADD, sync_data); |
69 syncer::SyncChange::ACTION_ADD, | |
70 sync_data); | |
71 } | 67 } |
72 } | 68 } |
73 | 69 |
74 syncer::SyncDataList AppSyncBundle::GetAllSyncData() const { | 70 syncer::SyncDataList AppSyncBundle::GetAllSyncData() const { |
75 std::vector<AppSyncData> app_sync_data = | 71 std::vector<AppSyncData> app_sync_data = |
76 extension_service_->GetAppSyncDataList(); | 72 extension_service_->GetAppSyncDataList(); |
77 syncer::SyncDataList result(app_sync_data.size()); | 73 syncer::SyncDataList result(app_sync_data.size()); |
78 for (int i = 0; i < static_cast<int>(app_sync_data.size()); ++i) { | 74 for (int i = 0; i < static_cast<int>(app_sync_data.size()); ++i) { |
79 result[i] = app_sync_data[i].GetSyncData(); | 75 result[i] = app_sync_data[i].GetSyncData(); |
80 } | 76 } |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 } | 157 } |
162 | 158 |
163 | 159 |
164 void AppSyncBundle::MarkPendingAppSynced(const std::string& id) { | 160 void AppSyncBundle::MarkPendingAppSynced(const std::string& id) { |
165 pending_sync_data_.erase(id); | 161 pending_sync_data_.erase(id); |
166 synced_apps_.insert(id); | 162 synced_apps_.insert(id); |
167 } | 163 } |
168 | 164 |
169 | 165 |
170 } // namespace extensions | 166 } // namespace extensions |
OLD | NEW |