| Index: components/invalidation/public/invalidation.h
|
| diff --git a/components/invalidation/public/invalidation.h b/components/invalidation/public/invalidation.h
|
| index 3a44f1944535608c6dc323c30c6e8d16f78e901b..bca3a1232972f7a23df5a0c7fcbc8d573a6ddb9e 100644
|
| --- a/components/invalidation/public/invalidation.h
|
| +++ b/components/invalidation/public/invalidation.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_H_
|
| #define COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/sequenced_task_runner.h"
|
| @@ -28,7 +29,7 @@ class INVALIDATION_EXPORT Invalidation {
|
| public:
|
| // Factory functions.
|
| static Invalidation Init(const invalidation::ObjectId& id,
|
| - int64 version,
|
| + int64_t version,
|
| const std::string& payload);
|
| static Invalidation InitUnknownVersion(const invalidation::ObjectId& id);
|
| static Invalidation InitFromDroppedInvalidation(const Invalidation& dropped);
|
| @@ -44,7 +45,7 @@ class INVALIDATION_EXPORT Invalidation {
|
| bool is_unknown_version() const;
|
|
|
| // Safe to call only if is_unknown_version() returns false.
|
| - int64 version() const;
|
| + int64_t version() const;
|
|
|
| // Safe to call only if is_unknown_version() returns false.
|
| const std::string& payload() const;
|
| @@ -96,7 +97,7 @@ class INVALIDATION_EXPORT Invalidation {
|
| private:
|
| Invalidation(const invalidation::ObjectId& id,
|
| bool is_unknown_version,
|
| - int64 version,
|
| + int64_t version,
|
| const std::string& payload,
|
| AckHandle ack_handle);
|
|
|
| @@ -108,7 +109,7 @@ class INVALIDATION_EXPORT Invalidation {
|
|
|
| // The version number of this invalidation. Should not be accessed if this is
|
| // an unkown version invalidation.
|
| - int64 version_;
|
| + int64_t version_;
|
|
|
| // The payaload associated with this invalidation. Should not be accessed if
|
| // this is an unknown version invalidation.
|
|
|