| 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 016993a0f656b372e2ad9ee53171a5c6ef048bb3..4f55f7fdab38c06b6117d135d2b83c55f90ab323 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
|
| @@ -148,11 +148,11 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| const MoveFileLocalSuccessCallback& success_callback,
|
| const ErrorCallback& error_callback,
|
| const base::File::Info& source_file_info);
|
| - virtual void CopyFileFromLocalInternal(
|
| + virtual void OnDidOpenFDToCopyFileFromLocal(
|
| const base::FilePath& device_file_path,
|
| const CopyFileFromLocalSuccessCallback& success_callback,
|
| const ErrorCallback& error_callback,
|
| - const int source_file_descriptor);
|
| + const std::pair<int, base::File::Error>& open_fd_result);
|
| virtual void DeleteFileInternal(
|
| const base::FilePath& file_path,
|
| const DeleteFileSuccessCallback& success_callback,
|
| @@ -242,6 +242,21 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
|
| scoped_ptr<SnapshotRequestInfo> snapshot_request_info,
|
| const base::File::Info& file_info);
|
|
|
| + // Called when GetFileInfo() for destination path succeeded for a
|
| + // CopyFileFromLocal operation.
|
| + void OnDidGetDestFileInfoToCopyFileFromLocal(
|
| + const ErrorCallback& error_callback,
|
| + const base::File::Info& file_info);
|
| +
|
| + // Called when GetFileInfo() for destination path failed to copy file from
|
| + // local.
|
| + void OnGetDestFileInfoErrorToCopyFileFromLocal(
|
| + const base::FilePath& source_file_path,
|
| + const base::FilePath& device_file_path,
|
| + const CopyFileFromLocalSuccessCallback& success_callback,
|
| + const ErrorCallback& error_callback,
|
| + const base::File::Error error);
|
| +
|
| // Called when ReadDirectory() succeeds.
|
| //
|
| // |dir_id| is the directory read.
|
|
|