| Index: content/browser/fileapi/upload_file_system_file_element_reader.h
|
| diff --git a/content/browser/fileapi/upload_file_system_file_element_reader.h b/content/browser/fileapi/upload_file_system_file_element_reader.h
|
| index bc2a6f7a71a8e266ea78c339b46f36567cf7a8f8..582e65cdf92d8bd929213fa5b5151aef328b9abf 100644
|
| --- a/content/browser/fileapi/upload_file_system_file_element_reader.h
|
| +++ b/content/browser/fileapi/upload_file_system_file_element_reader.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef CONTENT_BROWSER_FILEAPI_UPLOAD_FILE_SYSTEM_FILE_ELEMENT_READER_H_
|
| #define CONTENT_BROWSER_FILEAPI_UPLOAD_FILE_SYSTEM_FILE_ELEMENT_READER_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| #include "content/common/content_export.h"
|
| @@ -28,33 +30,33 @@ class CONTENT_EXPORT UploadFileSystemFileElementReader :
|
| UploadFileSystemFileElementReader(
|
| storage::FileSystemContext* file_system_context,
|
| const GURL& url,
|
| - uint64 range_offset,
|
| - uint64 range_length,
|
| + uint64_t range_offset,
|
| + uint64_t range_length,
|
| const base::Time& expected_modification_time);
|
| ~UploadFileSystemFileElementReader() override;
|
|
|
| // UploadElementReader overrides:
|
| int Init(const net::CompletionCallback& callback) override;
|
| - uint64 GetContentLength() const override;
|
| - uint64 BytesRemaining() const override;
|
| + uint64_t GetContentLength() const override;
|
| + uint64_t BytesRemaining() const override;
|
| int Read(net::IOBuffer* buf,
|
| int buf_length,
|
| const net::CompletionCallback& callback) override;
|
|
|
| private:
|
| - void OnGetLength(const net::CompletionCallback& callback, int64 result);
|
| + void OnGetLength(const net::CompletionCallback& callback, int64_t result);
|
| void OnRead(const net::CompletionCallback& callback, int result);
|
|
|
| scoped_refptr<storage::FileSystemContext> file_system_context_;
|
| const GURL url_;
|
| - const uint64 range_offset_;
|
| - const uint64 range_length_;
|
| + const uint64_t range_offset_;
|
| + const uint64_t range_length_;
|
| const base::Time expected_modification_time_;
|
|
|
| scoped_ptr<storage::FileStreamReader> stream_reader_;
|
|
|
| - uint64 stream_length_;
|
| - uint64 position_;
|
| + uint64_t stream_length_;
|
| + uint64_t position_;
|
|
|
| base::WeakPtrFactory<UploadFileSystemFileElementReader> weak_ptr_factory_;
|
|
|
|
|