Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Side by Side Diff: chrome/browser/extensions/sync_bundle.cc

Issue 1240573012: Extension syncing: Introduce a NeedsSync pref (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ext_sync_uninstall
Patch Set: more cleanup; fix test Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/sync_bundle.h" 5 #include "chrome/browser/extensions/sync_bundle.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "chrome/browser/extensions/extension_sync_data.h" 8 #include "chrome/browser/extensions/extension_sync_data.h"
9 #include "chrome/browser/extensions/extension_sync_service.h" 9 #include "chrome/browser/extensions/extension_sync_service.h"
10 #include "chrome/browser/extensions/extension_util.h" 10 #include "chrome/browser/extensions/extension_util.h"
(...skipping 10 matching lines...) Expand all
21 void SyncBundle::MergeDataAndStartSyncing( 21 void SyncBundle::MergeDataAndStartSyncing(
22 const syncer::SyncDataList& initial_sync_data, 22 const syncer::SyncDataList& initial_sync_data,
23 scoped_ptr<syncer::SyncChangeProcessor> sync_processor) { 23 scoped_ptr<syncer::SyncChangeProcessor> sync_processor) {
24 sync_processor_.reset(sync_processor.release()); 24 sync_processor_.reset(sync_processor.release());
25 25
26 for (const syncer::SyncData& sync_data : initial_sync_data) { 26 for (const syncer::SyncData& sync_data : initial_sync_data) {
27 scoped_ptr<ExtensionSyncData> extension_sync_data( 27 scoped_ptr<ExtensionSyncData> extension_sync_data(
28 ExtensionSyncData::CreateFromSyncData(sync_data)); 28 ExtensionSyncData::CreateFromSyncData(sync_data));
29 if (extension_sync_data.get()) { 29 if (extension_sync_data.get()) {
30 AddSyncedExtension(extension_sync_data->id()); 30 AddSyncedExtension(extension_sync_data->id());
31 sync_service_->ApplySyncData(*extension_sync_data); 31
32 // If the extension has local state that needs to be synced, ignore this
33 // change (we assume the local state is more recent).
34 if (!sync_service_->ExtensionNeedsSync(extension_sync_data->id()))
35 sync_service_->ApplySyncData(*extension_sync_data);
not at google - send to devlin 2015/07/16 18:25:47 It's odd to me that we make this check here, but t
Marc Treib 2015/07/17 10:24:06 Not quite - this also calls AddSyncedExtension for
not at google - send to devlin 2015/07/17 15:28:50 Ah right, thanks. "StartSyncing" would be even bet
Marc Treib 2015/07/20 09:28:22 Done.
32 } 36 }
33 } 37 }
34 } 38 }
35 39
36 void SyncBundle::Reset() { 40 void SyncBundle::Reset() {
37 sync_processor_.reset(); 41 sync_processor_.reset();
38 synced_extensions_.clear(); 42 synced_extensions_.clear();
39 pending_sync_data_.clear(); 43 pending_sync_data_.clear();
40 } 44 }
41 45
42 bool SyncBundle::IsSyncing() const { 46 bool SyncBundle::IsSyncing() const {
43 return sync_processor_ != nullptr; 47 return sync_processor_ != nullptr;
44 } 48 }
45 49
46 bool SyncBundle::HasExtensionId(const std::string& id) const {
47 return synced_extensions_.find(id) != synced_extensions_.end();
48 }
49
50 bool SyncBundle::ShouldIncludeInLocalSyncDataList(
51 const Extension& extension) const {
52 // If there is pending data for this extension, then this version is out of
53 // date. We'll sync back the version we got from sync.
54 return IsSyncing() && !HasPendingExtensionId(extension.id());
55 }
56
57 void SyncBundle::PushSyncDataList( 50 void SyncBundle::PushSyncDataList(
58 const syncer::SyncDataList& sync_data_list) { 51 const syncer::SyncDataList& sync_data_list) {
59 syncer::SyncChangeList sync_change_list; 52 syncer::SyncChangeList sync_change_list;
60 for (const syncer::SyncData& sync_data : sync_data_list) { 53 for (const syncer::SyncData& sync_data : sync_data_list) {
61 const syncer::SyncDataLocal sync_data_local(sync_data); 54 const syncer::SyncDataLocal sync_data_local(sync_data);
62 const std::string& extension_id = sync_data_local.GetTag(); 55 const std::string& extension_id = sync_data_local.GetTag();
63 56
64 sync_change_list.push_back(CreateSyncChange(extension_id, sync_data)); 57 sync_change_list.push_back(CreateSyncChange(extension_id, sync_data));
65 58
66 AddSyncedExtension(extension_id); 59 AddSyncedExtension(extension_id);
67 } 60 }
68 61
69 PushSyncChanges(sync_change_list); 62 PushSyncChanges(sync_change_list);
70 } 63 }
71 64
72 void SyncBundle::PushSyncDeletion(const std::string& extension_id, 65 void SyncBundle::PushSyncDeletion(const std::string& extension_id,
73 const syncer::SyncData& sync_data) { 66 const syncer::SyncData& sync_data) {
67 if (!HasSyncedExtension(extension_id))
68 return;
69
74 RemoveSyncedExtension(extension_id); 70 RemoveSyncedExtension(extension_id);
75 PushSyncChanges(syncer::SyncChangeList(1, 71 PushSyncChanges(syncer::SyncChangeList(1,
76 syncer::SyncChange(FROM_HERE, 72 syncer::SyncChange(FROM_HERE,
77 syncer::SyncChange::ACTION_DELETE, 73 syncer::SyncChange::ACTION_DELETE,
78 sync_data))); 74 sync_data)));
79 } 75 }
80 76
81 void SyncBundle::PushSyncAddOrUpdate(const Extension& extension) { 77 void SyncBundle::PushSyncAddOrUpdate(const std::string& extension_id,
82 syncer::SyncChangeList sync_change_list( 78 const syncer::SyncData& sync_data) {
83 1, 79 AddSyncedExtension(extension_id);
84 CreateSyncChange(extension.id(), 80 PushSyncChanges(syncer::SyncChangeList(
85 sync_service_->CreateSyncData(extension).GetSyncData())); 81 1, CreateSyncChange(extension_id, sync_data)));
86 PushSyncChanges(sync_change_list); 82 // Now sync and local state agree. If we had any pending change from sync,
87 MarkPendingExtensionSynced(extension.id()); 83 // clear it now.
84 pending_sync_data_.erase(extension_id);
88 } 85 }
89 86
90 void SyncBundle::ApplySyncChange(const syncer::SyncChange& sync_change) { 87 void SyncBundle::ApplySyncChange(const syncer::SyncChange& sync_change) {
91 scoped_ptr<ExtensionSyncData> extension_sync_data( 88 scoped_ptr<ExtensionSyncData> extension_sync_data(
92 ExtensionSyncData::CreateFromSyncChange(sync_change)); 89 ExtensionSyncData::CreateFromSyncChange(sync_change));
93 if (!extension_sync_data.get()) 90 if (!extension_sync_data.get())
94 return; // TODO(treib,kalman): Warning message? 91 return; // TODO(treib,kalman): Warning message?
95 92
96 if (extension_sync_data->uninstalled()) 93 if (extension_sync_data->uninstalled())
97 RemoveSyncedExtension(extension_sync_data->id()); 94 RemoveSyncedExtension(extension_sync_data->id());
98 else 95 else
99 AddSyncedExtension(extension_sync_data->id()); 96 AddSyncedExtension(extension_sync_data->id());
not at google - send to devlin 2015/07/16 18:25:47 Seems like the wrong place to be adding/removing t
Marc Treib 2015/07/17 10:24:06 Almost, but not quite :( There's some special code
100 sync_service_->ApplySyncData(*extension_sync_data); 97 sync_service_->ApplySyncData(*extension_sync_data);
101 } 98 }
102 99
103 bool SyncBundle::HasPendingExtensionId(const std::string& id) const { 100 bool SyncBundle::HasPendingExtensionId(const std::string& id) const {
104 return pending_sync_data_.find(id) != pending_sync_data_.end(); 101 return pending_sync_data_.find(id) != pending_sync_data_.end();
105 } 102 }
106 103
107 void SyncBundle::AddPendingExtension( 104 void SyncBundle::AddPendingExtension(
108 const std::string& id, 105 const std::string& id,
109 const ExtensionSyncData& extension_sync_data) { 106 const ExtensionSyncData& extension_sync_data) {
110 pending_sync_data_.insert(std::make_pair(id, extension_sync_data)); 107 pending_sync_data_.insert(std::make_pair(id, extension_sync_data));
111 } 108 }
112 109
113 std::vector<ExtensionSyncData> SyncBundle::GetPendingData() const { 110 std::vector<ExtensionSyncData> SyncBundle::GetPendingData() const {
114 std::vector<ExtensionSyncData> pending_extensions; 111 std::vector<ExtensionSyncData> pending_extensions;
115 for (const auto& data : pending_sync_data_) 112 for (const auto& data : pending_sync_data_)
116 pending_extensions.push_back(data.second); 113 pending_extensions.push_back(data.second);
117 114
118 return pending_extensions; 115 return pending_extensions;
119 } 116 }
120 117
121 syncer::SyncChange SyncBundle::CreateSyncChange( 118 syncer::SyncChange SyncBundle::CreateSyncChange(
122 const std::string& extension_id, 119 const std::string& extension_id,
123 const syncer::SyncData& sync_data) const { 120 const syncer::SyncData& sync_data) const {
124 return syncer::SyncChange( 121 return syncer::SyncChange(
125 FROM_HERE, 122 FROM_HERE,
126 HasExtensionId(extension_id) ? syncer::SyncChange::ACTION_UPDATE 123 HasSyncedExtension(extension_id) ? syncer::SyncChange::ACTION_UPDATE
127 : syncer::SyncChange::ACTION_ADD, 124 : syncer::SyncChange::ACTION_ADD,
128 sync_data); 125 sync_data);
129 } 126 }
130 127
131 void SyncBundle::PushSyncChanges( 128 void SyncBundle::PushSyncChanges(
132 const syncer::SyncChangeList& sync_change_list) { 129 const syncer::SyncChangeList& sync_change_list) {
133 sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); 130 sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list);
134 } 131 }
135 132
136 void SyncBundle::AddSyncedExtension(const std::string& id) { 133 void SyncBundle::AddSyncedExtension(const std::string& id) {
137 synced_extensions_.insert(id); 134 synced_extensions_.insert(id);
138 } 135 }
139 136
140 void SyncBundle::RemoveSyncedExtension(const std::string& id) { 137 void SyncBundle::RemoveSyncedExtension(const std::string& id) {
141 synced_extensions_.erase(id); 138 synced_extensions_.erase(id);
142 } 139 }
143 140
144 void SyncBundle::MarkPendingExtensionSynced(const std::string& id) { 141 bool SyncBundle::HasSyncedExtension(const std::string& id) const {
145 pending_sync_data_.erase(id); 142 return synced_extensions_.find(id) != synced_extensions_.end();
146 AddSyncedExtension(id);
147 } 143 }
148 144
149 } // namespace extensions 145 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698