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

Unified Diff: sync/api/sync_data.h

Issue 567053002: Pass AttachmentIdList instead of AttachmentList to SyncData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: sync/api/sync_data.h
diff --git a/sync/api/sync_data.h b/sync/api/sync_data.h
index 7a0c210de1919e7f14868841e70ce18975a49838..18df81a26a3604040ca11e7ca4ca098fd6154c9b 100644
--- a/sync/api/sync_data.h
+++ b/sync/api/sync_data.h
@@ -14,7 +14,7 @@
#include "base/memory/ref_counted.h"
#include "base/stl_util.h"
#include "base/time/time.h"
-#include "sync/api/attachments/attachment.h"
+#include "sync/api/attachments/attachment_id.h"
#include "sync/base/sync_export.h"
#include "sync/internal_api/public/attachments/attachment_service_proxy.h"
#include "sync/internal_api/public/base/model_type.h"
@@ -67,7 +67,7 @@ class SYNC_EXPORT SyncData {
const std::string& sync_tag,
const std::string& non_unique_title,
const sync_pb::EntitySpecifics& specifics,
- const AttachmentList& attachments);
+ const AttachmentIdList& attachment_ids);
// Helper method for creating SyncData objects originating from the syncer.
static SyncData CreateRemoteData(
@@ -136,8 +136,6 @@ class SYNC_EXPORT SyncData {
// The actual shared sync entity being held.
ImmutableSyncEntity immutable_entity_;
- Immutable<AttachmentList> attachments_;
-
AttachmentServiceProxy attachment_service_;
private:
@@ -147,7 +145,6 @@ class SYNC_EXPORT SyncData {
// Clears |entity| and |attachments|.
SyncData(int64 id,
sync_pb::SyncEntity* entity,
- AttachmentList* attachments,
const base::Time& remote_modification_time,
const syncer::AttachmentServiceProxy& attachment_service);
};
@@ -161,9 +158,6 @@ class SYNC_EXPORT SyncDataLocal : public SyncData {
explicit SyncDataLocal(const SyncData& sync_data);
~SyncDataLocal();
- // Return a list of this SyncData's attachments.
- const AttachmentList& GetLocalAttachmentsForUpload() const;
-
// Return the value of the unique client tag. This is only set for data going
// TO the syncer, not coming from.
const std::string& GetTag() const;

Powered by Google App Engine
This is Rietveld 408576698