| Index: chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h
|
| diff --git a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h
|
| index 5b5cee181e163821a1eb23b8d17933e988d20459..9737150128ff95174d05122ff81a447dd63d5f41 100644
|
| --- a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h
|
| +++ b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_DELEGATE_IMPL_LINUX_H_
|
| #define CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_DELEGATE_IMPL_LINUX_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <deque>
|
| #include <map>
|
| #include <set>
|
| @@ -60,7 +62,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| class MTPFileNode;
|
|
|
| // Maps file ids to file nodes.
|
| - typedef std::map<uint32, MTPFileNode*> FileIdToMTPFileNodeMap;
|
| + typedef std::map<uint32_t, MTPFileNode*> FileIdToMTPFileNodeMap;
|
|
|
| // Maps file paths to file info.
|
| typedef std::map<base::FilePath, MTPDeviceTaskHelper::MTPEntry> FileInfoCache;
|
| @@ -96,7 +98,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| bool IsStreaming() override;
|
| void ReadBytes(const base::FilePath& device_file_path,
|
| const scoped_refptr<net::IOBuffer>& buf,
|
| - int64 offset,
|
| + int64_t offset,
|
| int buf_len,
|
| const ReadBytesSuccessCallback& success_callback,
|
| const ErrorCallback& error_callback) override;
|
| @@ -160,7 +162,9 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| const ErrorCallback& error_callback);
|
| virtual void ReadBytesInternal(
|
| const base::FilePath& device_file_path,
|
| - net::IOBuffer* buf, int64 offset, int buf_len,
|
| + net::IOBuffer* buf,
|
| + int64_t offset,
|
| + int buf_len,
|
| const ReadBytesSuccessCallback& success_callback,
|
| const ErrorCallback& error_callback);
|
| virtual void MoveFileLocalInternal(
|
| @@ -207,7 +211,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| // Called when ReadDirectory succeeds.
|
| virtual void OnDidReadDirectoryToDeleteDirectory(
|
| const base::FilePath& directory_path,
|
| - const uint32 directory_id,
|
| + const uint32_t directory_id,
|
| const DeleteDirectorySuccessCallback& success_callback,
|
| const ErrorCallback& error_callback,
|
| const MTPDeviceTaskHelper::MTPEntries& entries,
|
| @@ -216,7 +220,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| // Calls DeleteObjectOnUIThread on UI thread.
|
| virtual void RunDeleteObjectOnUIThread(
|
| const base::FilePath& object_path,
|
| - const uint32 object_id,
|
| + const uint32_t object_id,
|
| const DeleteObjectSuccessCallback& success_callback,
|
| const ErrorCallback& error_callback);
|
|
|
| @@ -289,7 +293,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| // If |dir_id| is not a directory, |error_callback| is invoked to notify the
|
| // caller about the file error and process the next pending request.
|
| void OnDidGetFileInfoToReadDirectory(
|
| - uint32 dir_id,
|
| + uint32_t dir_id,
|
| const ReadDirectorySuccessCallback& success_callback,
|
| const ErrorCallback& error_callback,
|
| const base::File::Info& file_info);
|
| @@ -347,7 +351,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| // file entries.
|
| // |file_list| contains the directory file entries with their file ids.
|
| // |has_more| is true if there are more file entries to read.
|
| - void OnDidReadDirectory(uint32 dir_id,
|
| + void OnDidReadDirectory(uint32_t dir_id,
|
| const ReadDirectorySuccessCallback& success_callback,
|
| const MTPDeviceTaskHelper::MTPEntries& mtp_entries,
|
| bool has_more);
|
| @@ -413,7 +417,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| void OnDidMoveFileLocalWithRename(
|
| const MoveFileLocalSuccessCallback& success_callback,
|
| const base::FilePath& source_file_path,
|
| - const uint32 file_id);
|
| + const uint32_t file_id);
|
|
|
| // Called when CopyFileFromLocal() succeeds.
|
| void OnDidCopyFileFromLocal(
|
| @@ -433,7 +437,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
|
|
| // Called when DeleteObject() succeeds.
|
| void OnDidDeleteObject(const base::FilePath& object_path,
|
| - const uint32 object_id,
|
| + const uint32_t object_id,
|
| const DeleteObjectSuccessCallback success_callback);
|
|
|
| // Called when DeleteFileOrDirectory() fails.
|
| @@ -443,7 +447,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| // Handles the device file |error| while operating on |file_id|.
|
| // |error_callback| is invoked to notify the caller about the file error.
|
| void HandleDeviceFileError(const ErrorCallback& error_callback,
|
| - uint32 file_id,
|
| + uint32_t file_id,
|
| base::File::Error error);
|
|
|
| // Given a full path, returns a non-empty sub-path that needs to be read into
|
| @@ -458,10 +462,10 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
|
|
| // Given a full path, if it exists in the cache, writes the file's id to |id|
|
| // and return true.
|
| - bool CachedPathToId(const base::FilePath& path, uint32* id) const;
|
| + bool CachedPathToId(const base::FilePath& path, uint32_t* id) const;
|
|
|
| // Evict the cache of |id|.
|
| - void EvictCachedPathToId(const uint32 id);
|
| + void EvictCachedPathToId(const uint32_t id);
|
|
|
| // MTP device initialization state.
|
| InitializationState init_state_;
|
|
|