diff options
author | avi <avi@chromium.org> | 2015-12-21 19:14:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-22 03:15:12 +0000 |
commit | 4856ced07dfda549a142df3a5fa28cbb73bf1865 (patch) | |
tree | a81aceedc8ee5507d9f22fb4f163d847bfae6d28 /sync/api/sync_data.h | |
parent | 5af9dfc5f6ed2163b13d8c20d679bdb44c783769 (diff) | |
download | chromium_src-4856ced07dfda549a142df3a5fa28cbb73bf1865.zip chromium_src-4856ced07dfda549a142df3a5fa28cbb73bf1865.tar.gz chromium_src-4856ced07dfda549a142df3a5fa28cbb73bf1865.tar.bz2 |
Switch to standard integer types in sync/.
BUG=138542
TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/1545553003
Cr-Commit-Position: refs/heads/master@{#366533}
Diffstat (limited to 'sync/api/sync_data.h')
-rw-r--r-- | sync/api/sync_data.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sync/api/sync_data.h b/sync/api/sync_data.h index e3885291..a516eab 100644 --- a/sync/api/sync_data.h +++ b/sync/api/sync_data.h @@ -5,11 +5,12 @@ #ifndef SYNC_API_SYNC_DATA_H_ #define SYNC_API_SYNC_DATA_H_ +#include <stdint.h> + #include <iosfwd> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/stl_util.h" @@ -71,7 +72,7 @@ class SYNC_EXPORT SyncData { // Helper method for creating SyncData objects originating from the syncer. static SyncData CreateRemoteData( - int64 id, + int64_t id, const sync_pb::EntitySpecifics& specifics, const base::Time& last_modified_time, const AttachmentIdList& attachment_ids, @@ -128,7 +129,7 @@ class SYNC_EXPORT SyncData { ImmutableSyncEntity; // Equal to kInvalidId iff this is local. - int64 id_; + int64_t id_; // This may be null if the SyncData represents a deleted item. base::Time remote_modification_time_; @@ -143,7 +144,7 @@ class SYNC_EXPORT SyncData { bool is_valid_; // Clears |entity| and |attachments|. - SyncData(int64 id, + SyncData(int64_t id, sync_pb::SyncEntity* entity, const base::Time& remote_modification_time, const syncer::AttachmentServiceProxy& attachment_service); @@ -176,7 +177,7 @@ class SYNC_EXPORT SyncDataRemote : public SyncData { // if the SyncData represents a deleted item. const base::Time& GetModifiedTime() const; - int64 GetId() const; + int64_t GetId() const; // Retrieve the attachments indentified by |attachment_ids|. Invoke // |callback| with the requested attachments. |