Chromium Code Reviews| 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/extension_sync_bundle.h" | 5 #include "chrome/browser/extensions/extension_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" |
| 11 #include "chrome/common/extensions/extension_set.h" | 11 #include "chrome/common/extensions/extension_set.h" |
| 12 #include "sync/api/sync_change_processor.h" | 12 #include "sync/api/sync_change_processor.h" |
| 13 #include "sync/api/sync_error_factory.h" | 13 #include "sync/api/sync_error_factory.h" |
| 14 | 14 |
| 15 namespace extensions { | 15 namespace extensions { |
| 16 | 16 |
| 17 ExtensionSyncBundle::ExtensionSyncBundle(ExtensionService* extension_service) | 17 ExtensionSyncBundle::ExtensionSyncBundle(ExtensionService* extension_service) |
| 18 : extension_service_(extension_service), sync_processor_(NULL) {} | 18 : extension_service_(extension_service), sync_processor_(NULL) {} |
| 19 | 19 |
| 20 ExtensionSyncBundle::~ExtensionSyncBundle() {} | 20 ExtensionSyncBundle::~ExtensionSyncBundle() {} |
| 21 | 21 |
| 22 void ExtensionSyncBundle::SetupSync(SyncChangeProcessor* sync_processor, | 22 void ExtensionSyncBundle::SetupSync( |
| 23 SyncErrorFactory* sync_error_factory, | 23 csync::SyncChangeProcessor* sync_processor, |
| 24 const SyncDataList& initial_sync_data) { | 24 csync::SyncErrorFactory* sync_error_factory, |
| 25 const csync::SyncDataList& initial_sync_data) { | |
| 25 sync_processor_.reset(sync_processor); | 26 sync_processor_.reset(sync_processor); |
| 26 sync_error_factory_.reset(sync_error_factory); | 27 sync_error_factory_.reset(sync_error_factory); |
| 27 | 28 |
| 28 for (SyncDataList::const_iterator i = initial_sync_data.begin(); | 29 for (csync::SyncDataList::const_iterator i = initial_sync_data.begin(); |
| 29 i != initial_sync_data.end(); | 30 i != initial_sync_data.end(); |
| 30 ++i) { | 31 ++i) { |
| 31 ExtensionSyncData extension_sync_data(*i); | 32 ExtensionSyncData extension_sync_data(*i); |
|
asargent_no_longer_on_chrome
2012/06/26 18:08:17
nit: double space
akalin
2012/06/26 20:28:28
Done.
| |
| 32 AddExtension(extension_sync_data.id()); | 33 AddExtension(extension_sync_data.id()); |
| 33 extension_service_->ProcessExtensionSyncData(extension_sync_data); | 34 extension_service_->ProcessExtensionSyncData(extension_sync_data); |
| 34 } | 35 } |
| 35 } | 36 } |
| 36 | 37 |
| 37 void ExtensionSyncBundle::Reset() { | 38 void ExtensionSyncBundle::Reset() { |
| 38 sync_processor_.reset(); | 39 sync_processor_.reset(); |
| 39 sync_error_factory_.reset(); | 40 sync_error_factory_.reset(); |
| 40 synced_extensions_.clear(); | 41 synced_extensions_.clear(); |
| 41 pending_sync_data_.clear(); | 42 pending_sync_data_.clear(); |
| 42 } | 43 } |
| 43 | 44 |
| 44 SyncChange ExtensionSyncBundle::CreateSyncChangeToDelete( | 45 csync::SyncChange ExtensionSyncBundle::CreateSyncChangeToDelete( |
| 45 const Extension* extension) const { | 46 const Extension* extension) const { |
| 46 extensions::ExtensionSyncData sync_data = | 47 extensions::ExtensionSyncData sync_data = |
|
asargent_no_longer_on_chrome
2012/06/26 18:08:17
nit: double space
akalin
2012/06/26 20:28:28
Done.
| |
| 47 extension_service_->GetExtensionSyncData(*extension); | 48 extension_service_->GetExtensionSyncData(*extension); |
| 48 return sync_data.GetSyncChange(SyncChange::ACTION_DELETE); | 49 return sync_data.GetSyncChange(csync::SyncChange::ACTION_DELETE); |
| 49 } | 50 } |
| 50 | 51 |
| 51 void ExtensionSyncBundle::ProcessDeletion(std::string extension_id, | 52 void ExtensionSyncBundle::ProcessDeletion( |
| 52 const SyncChange& sync_change) { | 53 std::string extension_id, const csync::SyncChange& sync_change) { |
| 53 RemoveExtension(extension_id); | 54 RemoveExtension(extension_id); |
| 54 sync_processor_->ProcessSyncChanges(FROM_HERE, | 55 sync_processor_->ProcessSyncChanges(FROM_HERE, |
| 55 SyncChangeList(1, sync_change)); | 56 csync::SyncChangeList(1, sync_change)); |
| 56 } | 57 } |
| 57 | 58 |
| 58 SyncChange ExtensionSyncBundle::CreateSyncChange(const SyncData& sync_data) { | 59 csync::SyncChange ExtensionSyncBundle::CreateSyncChange( |
| 60 const csync::SyncData& sync_data) { | |
| 59 if (HasExtensionId(sync_data.GetTag())) { | 61 if (HasExtensionId(sync_data.GetTag())) { |
| 60 return SyncChange(SyncChange::ACTION_UPDATE, sync_data); | 62 return csync::SyncChange(csync::SyncChange::ACTION_UPDATE, sync_data); |
| 61 } else { | 63 } else { |
| 62 AddExtension(sync_data.GetTag()); | 64 AddExtension(sync_data.GetTag()); |
| 63 return SyncChange(SyncChange::ACTION_ADD, sync_data); | 65 return csync::SyncChange(csync::SyncChange::ACTION_ADD, sync_data); |
| 64 } | 66 } |
| 65 } | 67 } |
| 66 | 68 |
| 67 SyncDataList ExtensionSyncBundle::GetAllSyncData() const { | 69 csync::SyncDataList ExtensionSyncBundle::GetAllSyncData() const { |
| 68 std::vector<ExtensionSyncData> extension_sync_data = | 70 std::vector<ExtensionSyncData> extension_sync_data = |
| 69 extension_service_->GetExtensionSyncDataList(); | 71 extension_service_->GetExtensionSyncDataList(); |
| 70 SyncDataList result(extension_sync_data.size()); | 72 csync::SyncDataList result(extension_sync_data.size()); |
| 71 for (int i = 0; i < static_cast<int>(extension_sync_data.size()); ++i) { | 73 for (int i = 0; i < static_cast<int>(extension_sync_data.size()); ++i) { |
| 72 result[i] = extension_sync_data[i].GetSyncData(); | 74 result[i] = extension_sync_data[i].GetSyncData(); |
| 73 } | 75 } |
| 74 return result; | 76 return result; |
| 75 } | 77 } |
| 76 | 78 |
| 77 void ExtensionSyncBundle::SyncChangeIfNeeded(const Extension& extension) { | 79 void ExtensionSyncBundle::SyncChangeIfNeeded(const Extension& extension) { |
| 78 ExtensionSyncData extension_sync_data = | 80 ExtensionSyncData extension_sync_data = |
|
asargent_no_longer_on_chrome
2012/06/26 18:08:17
nit: double space
akalin
2012/06/26 20:28:28
Done.
| |
| 79 extension_service_->GetExtensionSyncData(extension); | 81 extension_service_->GetExtensionSyncData(extension); |
| 80 | 82 |
| 81 SyncChangeList sync_change_list(1, extension_sync_data.GetSyncChange( | 83 csync::SyncChangeList sync_change_list(1, extension_sync_data.GetSyncChange( |
| 82 HasExtensionId(extension.id()) ? | 84 HasExtensionId(extension.id()) ? |
| 83 SyncChange::ACTION_UPDATE : SyncChange::ACTION_ADD)); | 85 csync::SyncChange::ACTION_UPDATE : csync::SyncChange::ACTION_ADD)); |
| 84 sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); | 86 sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); |
| 85 MarkPendingExtensionSynced(extension.id()); | 87 MarkPendingExtensionSynced(extension.id()); |
| 86 } | 88 } |
| 87 | 89 |
| 88 void ExtensionSyncBundle::ProcessSyncChange( | 90 void ExtensionSyncBundle::ProcessSyncChange( |
| 89 ExtensionSyncData extension_sync_data) { | 91 ExtensionSyncData extension_sync_data) { |
|
asargent_no_longer_on_chrome
2012/06/26 18:08:17
nit: double space
akalin
2012/06/26 20:28:28
Done.
| |
| 90 if (extension_sync_data.uninstalled()) | 92 if (extension_sync_data.uninstalled()) |
| 91 RemoveExtension(extension_sync_data.id()); | 93 RemoveExtension(extension_sync_data.id()); |
| 92 else | 94 else |
| 93 AddExtension(extension_sync_data.id()); | 95 AddExtension(extension_sync_data.id()); |
| 94 extension_service_->ProcessExtensionSyncData(extension_sync_data); | 96 extension_service_->ProcessExtensionSyncData(extension_sync_data); |
| 95 } | 97 } |
| 96 | 98 |
| 97 void ExtensionSyncBundle::ProcessSyncChangeList( | 99 void ExtensionSyncBundle::ProcessSyncChangeList( |
| 98 SyncChangeList sync_change_list) { | 100 csync::SyncChangeList sync_change_list) { |
| 99 sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); | 101 sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); |
| 100 } | 102 } |
| 101 | 103 |
| 102 bool ExtensionSyncBundle::HasExtensionId( | 104 bool ExtensionSyncBundle::HasExtensionId( |
| 103 const std::string& id) const { | 105 const std::string& id) const { |
| 104 return synced_extensions_.find(id) != synced_extensions_.end(); | 106 return synced_extensions_.find(id) != synced_extensions_.end(); |
| 105 } | 107 } |
| 106 | 108 |
| 107 bool ExtensionSyncBundle::HasPendingExtensionId( | 109 bool ExtensionSyncBundle::HasPendingExtensionId( |
| 108 const std::string& id) const { | 110 const std::string& id) const { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 156 void ExtensionSyncBundle::RemoveExtension(const std::string& id) { | 158 void ExtensionSyncBundle::RemoveExtension(const std::string& id) { |
| 157 synced_extensions_.erase(id); | 159 synced_extensions_.erase(id); |
| 158 } | 160 } |
| 159 | 161 |
| 160 void ExtensionSyncBundle::MarkPendingExtensionSynced(const std::string& id) { | 162 void ExtensionSyncBundle::MarkPendingExtensionSynced(const std::string& id) { |
| 161 pending_sync_data_.erase(id); | 163 pending_sync_data_.erase(id); |
| 162 synced_extensions_.insert(id); | 164 synced_extensions_.insert(id); |
| 163 } | 165 } |
| 164 | 166 |
| 165 } // namespace extensions | 167 } // namespace extensions |
| OLD | NEW |