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

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

Issue 15785004: Move from drive/other to drive/root should not use the copy+delete bypass. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/file_copy_manager.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/file_system/move_operation.cc
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.cc b/chrome/browser/chromeos/drive/file_system/move_operation.cc
index c7e490a23e91e465de2c9596c451f5ef94558a1b..fea40b6af4287d383ea811a2a3ed4a86b5586c85 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/move_operation.cc
@@ -212,6 +212,13 @@ void MoveOperation::RemoveFromDirectory(
const FileOperationCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ // Moving files out from "drive/other" special folder for storing orphan files
+ // has no meaning in the server. Just skip the step.
+ if (util::IsSpecialResourceId(directory_resource_id)) {
+ callback.Run(FILE_ERROR_OK);
+ return;
+ }
+
scheduler_->RemoveResourceFromDirectory(
directory_resource_id,
resource_id,
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/file_copy_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698