Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: chrome/browser/chromeos/drive/file_system/copy_operation.cc

Issue 14884015: drive: Remove DriveFileType (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « chrome/browser/chromeos/drive/file_system/copy_operation.h ('k') | chrome/browser/chromeos/drive/file_system_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698