| Index: chrome/browser/chromeos/drive/file_system/copy_operation.cc
|
| diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/chrome/browser/chromeos/drive/file_system/copy_operation.cc
|
| index e3b3ed0d64d708ad1d63403c3ab1c3a65cec3d48..14eb4a67747d9d2b1071f042ba4dae7e781dd91d 100644
|
| --- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc
|
| +++ b/chrome/browser/chromeos/drive/file_system/copy_operation.cc
|
| @@ -119,8 +119,7 @@ void CopyOperation::OnGetFileCompleteForTransferFile(
|
| const FileOperationCallback& callback,
|
| FileError error,
|
| const base::FilePath& local_file_path,
|
| - const std::string& unused_mime_type,
|
| - DriveFileType file_type) {
|
| + scoped_ptr<ResourceEntry> entry) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DCHECK(!callback.is_null());
|
|
|
| @@ -331,8 +330,7 @@ void CopyOperation::OnGetFileCompleteForCopy(
|
| const FileOperationCallback& callback,
|
| FileError error,
|
| const base::FilePath& local_file_path,
|
| - const std::string& unused_mime_type,
|
| - DriveFileType file_type) {
|
| + scoped_ptr<ResourceEntry> entry) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DCHECK(!callback.is_null());
|
|
|
| @@ -342,7 +340,7 @@ void CopyOperation::OnGetFileCompleteForCopy(
|
| }
|
|
|
| // This callback is only triggered for a regular file via Copy().
|
| - DCHECK_EQ(REGULAR_FILE, file_type);
|
| + DCHECK(entry && !entry->file_specific_info().is_hosted_document());
|
| ScheduleTransferRegularFile(local_file_path, remote_dest_file_path, callback);
|
| }
|
|
|
|
|